x
/
fuel-ccp-glance
Code Issues Proposed changes

Check create_certificates option before exporting certificate 

We need to export certificate file only when it's enabled in general
config.

Change-Id: I334810309609c0b55054e89c2f1079f4bb56c2c9
This commit is contained in:
Sergey Kraynev 2017-03-02 08:39:14 +00:00
parent b368e4833e
commit 3a1602e493
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
service/files/glance-cirros-image-upload.sh.j2
View File

@ -9,7 +9,9 @@ export OS_PASSWORD={{ openstack.user_password }}
export OS_USERNAME={{ openstack.user_name }}
export OS_PROJECT_NAME={{ openstack.project_name }}
export OS_AUTH_URL="{{ address('keystone', keystone.admin_port, with_scheme=True) }}/v3"
{% if security.tls.create_certificates %}
export OS_CACERT="/opt/ccp/etc/tls/ca.pem"
{% endif %}
{% set image = glance.bootstrap.image %}
FILE="$(mktemp)"