summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorProskurin Kirill <kproskurin@mirantis.com>2017-03-17 13:59:44 +0300
committermzhnichkov <mzhnichkov@mirantis.com>2017-03-22 05:04:18 +0000
commitbb32b240cd5542f236a0543bba1664ed67f086c3 (patch)
tree2a3108f95cb73ad2e3b6112dd57f8eabee76d18e
parentd79f2e5a1c9586751d08a98a6d1e7e11d9688b1d (diff)
Possible fix for glance swift sslHEADmaster
Notes
Notes (review): Verified+1: Mirantis CCP CI <mirantis-fuel-ccp-ci@mirantis.com> Code-Review+2: Sergey Reshetnyak <sreshetniak@mirantis.com> Code-Review+2: Andrey Pavlov <apavlov@mirantis.com> Workflow+1: Andrey Pavlov <apavlov@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Fri, 24 Mar 2017 14:47:48 +0000 Reviewed-on: https://review.openstack.org/446955 Project: openstack/fuel-ccp-glance Branch: refs/heads/master
-rw-r--r--service/files/glance-api.conf.j24
1 files changed, 4 insertions, 0 deletions
diff --git a/service/files/glance-api.conf.j2 b/service/files/glance-api.conf.j2
index e325565..ac2dcbd 100644
--- a/service/files/glance-api.conf.j2
+++ b/service/files/glance-api.conf.j2
@@ -40,12 +40,16 @@ rbd_store_ceph_conf = /etc/ceph/ceph.conf
40{% elif glance.swift.enable %} 40{% elif glance.swift.enable %}
41stores = http,swift 41stores = http,swift
42default_store = swift 42default_store = swift
43swift_store_multi_tenant = True
43swift_store_create_container_on_put = {{ glance.swift.store_create_container_on_put }} 44swift_store_create_container_on_put = {{ glance.swift.store_create_container_on_put }}
44swift_store_region = RegionOne 45swift_store_region = RegionOne
45default_swift_reference = swift 46default_swift_reference = swift
46swift_store_container = {{ glance.swift.store_container }} 47swift_store_container = {{ glance.swift.store_container }}
47swift_store_config_file = /etc/glance/glance-swift-store.conf 48swift_store_config_file = /etc/glance/glance-swift-store.conf
48swift_store_auth_insecure = {{ glance.swift.store_auth_insecure }} 49swift_store_auth_insecure = {{ glance.swift.store_auth_insecure }}
50{% if security.tls.create_certificates %}
51swift_store_cacert = /opt/ccp/etc/tls/ca.pem
52{% endif %}
49{% else %} 53{% else %}
50stores = http,file 54stores = http,file
51default_store = file 55default_store = file