aboutsummaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-07-27 19:28:13 +0000
committerGerrit Code Review <review@openstack.org>2016-07-27 19:28:13 +0000
commit9aa0acb65b8ba2e894bf06be4c818eeff3bc3209 (patch)
tree38e2926a594764c5685d48664f28596e8a7ddd7c /etc
parentd3c7c08062979ae41fc061c61d29ae9d51c56bb2 (diff)
parenta66f0076eab1907fb4a0ed68e76ac28ac9e03201 (diff)
downloadkolla-9aa0acb65b8ba2e894bf06be4c818eeff3bc3209.tar.gz
kolla-9aa0acb65b8ba2e894bf06be4c818eeff3bc3209.zip
Merge "Consistent external Ceph configuration for Glance"
Diffstat (limited to 'etc')
-rw-r--r--etc/kolla/globals.yml11
1 files changed, 7 insertions, 4 deletions
diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml
index 1b6f006cd..6b1b192a5 100644
--- a/etc/kolla/globals.yml
+++ b/etc/kolla/globals.yml
@@ -126,10 +126,6 @@ neutron_external_interface: "eth1"
#enable_swift: "no"
#enable_tempest: "no"
-# Control usage of ceph per service. This allows to configure external ceph
-# when ceph is not deployed by Kolla.
-#glance_enable_ceph: "{{ enable_ceph }}"
-
###################
# Ceph options
@@ -144,6 +140,13 @@ neutron_external_interface: "eth1"
# Valid options are [ erasure, replicated ]
#ceph_pool_type: "replicated"
+#######################
+# Glance options
+#######################
+# Configure image backend.
+glance_backend_file: "yes"
+#glance_backend_ceph: "no"
+
#######################
# Cinder options