summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Kraynev <skraynev@mirantis.com>2017-03-02 08:39:14 +0000
committerSergey Kraynev <skraynev@mirantis.com>2017-03-02 08:40:39 +0000
commit3a1602e493c04048706b742309e629558fa14688 (patch)
treea3e811c205d638a6e4ebab681ccf19e261ed9d85
parentb368e4833eb986df3a1e89467b88078365454cda (diff)
Check create_certificates option before exporting certificate
We need to export certificate file only when it's enabled in general config. Change-Id: I334810309609c0b55054e89c2f1079f4bb56c2c9
Notes
Notes (review): Code-Review+2: Proskurin Kirill <kproskurin@mirantis.com> Verified+1: Mirantis CCP CI <mirantis-fuel-ccp-ci@mirantis.com> Code-Review+2: Sergey Reshetnyak <sreshetniak@mirantis.com> Workflow+1: Sergey Reshetnyak <sreshetniak@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Mon, 06 Mar 2017 10:15:55 +0000 Reviewed-on: https://review.openstack.org/440210 Project: openstack/fuel-ccp-glance Branch: refs/heads/master
-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)"