diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-11-04 12:04:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-11-04 12:04:37 +0000 |
| commit | 466866aaa40af381ef7256a9b3fcbe41afcd7e6e (patch) | |
| tree | 135e74abf03be94528f2d6879fac3f35759d8d47 | |
| parent | 8b095825dc294f8c276d71784c1fea79f9ab9a33 (diff) | |
| parent | dd50d686767e2aee4b90dc67c58fb8566800c247 (diff) | |
| download | kolla-466866aaa40af381ef7256a9b3fcbe41afcd7e6e.tar.gz kolla-466866aaa40af381ef7256a9b3fcbe41afcd7e6e.zip | |
Merge "Add OS_CACERT in openrc when it is configured"
| -rw-r--r-- | ansible/group_vars/all.yml | 1 | ||||
| -rw-r--r-- | ansible/roles/common/templates/admin-openrc.sh.j2 | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 7834e5ddf..52fb06f52 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -322,6 +322,7 @@ haproxy_user: "openstack" haproxy_enable_external_vip: "{{ 'no' if kolla_external_vip_address == kolla_internal_vip_address else 'yes' }}" kolla_enable_tls_external: "no" kolla_external_fqdn_cert: "{{ node_config_directory }}/certificates/haproxy.pem" +kolla_external_fqdn_cacert: "{{ node_config_directory }}/certificates/haproxy-ca.crt" #################### diff --git a/ansible/roles/common/templates/admin-openrc.sh.j2 b/ansible/roles/common/templates/admin-openrc.sh.j2 index 7b5a3939b..ef3890043 100644 --- a/ansible/roles/common/templates/admin-openrc.sh.j2 +++ b/ansible/roles/common/templates/admin-openrc.sh.j2 @@ -6,3 +6,6 @@ export OS_USERNAME=admin export OS_PASSWORD={{ keystone_admin_password }} export OS_AUTH_URL={{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}/v3 export OS_IDENTITY_API_VERSION=3 +{% if kolla_enable_tls_external | bool and kolla_external_fqdn_cacert %} +export OS_CACERT={{ kolla_external_fqdn_cacert }} +{% endif %} |