Merge "Check create_certificates option before exporting certificate"
This commit is contained in:
commit
b720b58319
|
@ -9,7 +9,9 @@ export OS_PASSWORD={{ openstack.user_password }}
|
||||||
export OS_USERNAME={{ openstack.user_name }}
|
export OS_USERNAME={{ openstack.user_name }}
|
||||||
export OS_PROJECT_NAME={{ openstack.project_name }}
|
export OS_PROJECT_NAME={{ openstack.project_name }}
|
||||||
export OS_AUTH_URL="{{ address('keystone', keystone.admin_port, with_scheme=True) }}/v3"
|
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"
|
export OS_CACERT="/opt/ccp/etc/tls/ca.pem"
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
{% set image = glance.bootstrap.image %}
|
{% set image = glance.bootstrap.image %}
|
||||||
FILE="$(mktemp)"
|
FILE="$(mktemp)"
|
||||||
|
|
Loading…
Reference in New Issue