summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-06 10:15:55 +0000
committerGerrit Code Review <review@openstack.org>2017-03-06 10:15:55 +0000
commitb720b58319452c6c6fbe4a9375275d4447fefc62 (patch)
tree144799b328651f605471c92c4ad14adaf7851bd1
parent022bd8b8fbd0c2757c09559406cbbba6c7a5f791 (diff)
parent3a1602e493c04048706b742309e629558fa14688 (diff)
Merge "Check create_certificates option before exporting certificate"
-rw-r--r--service/files/glance-cirros-image-upload.sh.j22
1 files changed, 2 insertions, 0 deletions
diff --git a/service/files/glance-cirros-image-upload.sh.j2 b/service/files/glance-cirros-image-upload.sh.j2
index d195a69..79a9706 100644
--- a/service/files/glance-cirros-image-upload.sh.j2
+++ b/service/files/glance-cirros-image-upload.sh.j2
@@ -9,7 +9,9 @@ export OS_PASSWORD={{ openstack.user_password }}
9export OS_USERNAME={{ openstack.user_name }} 9export OS_USERNAME={{ openstack.user_name }}
10export OS_PROJECT_NAME={{ openstack.project_name }} 10export OS_PROJECT_NAME={{ openstack.project_name }}
11export OS_AUTH_URL="{{ address('keystone', keystone.admin_port, with_scheme=True) }}/v3" 11export OS_AUTH_URL="{{ address('keystone', keystone.admin_port, with_scheme=True) }}/v3"
12{% if security.tls.create_certificates %}
12export OS_CACERT="/opt/ccp/etc/tls/ca.pem" 13export OS_CACERT="/opt/ccp/etc/tls/ca.pem"
14{% endif %}
13 15
14{% set image = glance.bootstrap.image %} 16{% set image = glance.bootstrap.image %}
15FILE="$(mktemp)" 17FILE="$(mktemp)"