Browse Source

Merge "Check create_certificates option before exporting certificate"

Jenkins 2 years ago
parent
commit
b720b58319
1 changed files with 2 additions and 0 deletions
  1. 2
    0
      service/files/glance-cirros-image-upload.sh.j2

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

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

Loading…
Cancel
Save