Merge "Enable http store in glance"

This commit is contained in:
Jenkins 2016-12-06 17:31:50 +00:00 committed by Gerrit Code Review
commit 77c95a4ff0
1 changed files with 3 additions and 2 deletions

View File

@ -38,13 +38,13 @@ flavor = keystone
[glance_store]
{% if glance.ceph.enable %}
stores = rbd
stores = http,rbd
default_store = rbd
rbd_store_pool = {{ glance.ceph.pool_name }}
rbd_store_user = {{ glance.ceph.username }}
rbd_store_ceph_conf = /etc/ceph/ceph.conf
{% elif glance.swift.enable %}
stores = swift
stores = http,swift
default_store = swift
swift_store_create_container_on_put = {{ glance.swift.store_create_container_on_put }}
swift_store_region = RegionOne
@ -52,6 +52,7 @@ default_swift_reference = swift
swift_store_container = {{ glance.swift.store_container }}
swift_store_config_file = /etc/glance/glance-swift-store.conf
{% else %}
stores = http,file
default_store = file
filesystem_store_datadir = /var/lib/glance/images/
{% endif %}