openstack/kolla-ansible
Code Issues Proposed changes

Add OS_CACERT in openrc when it is configured

Browse Source 
TrivialFix

Change-Id: I5750645d63c27d3778df27ca090ceccbc08d5eef
This commit is contained in:
Jeffrey Zhang 2016-10-18 09:49:54 +08:00 committed by Jeffrey Zhang
parent 16d772cd53
commit dd50d68676
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/group_vars/all.yml
View File

@ -322,6 +322,7 @@ haproxy_user: "openstack"
haproxy_enable_external_vip: "{{ 'no' if kolla_external_vip_address == kolla_internal_vip_address else 'yes' }}" haproxy_enable_external_vip: "{{ 'no' if kolla_external_vip_address == kolla_internal_vip_address else 'yes' }}"
kolla_enable_tls_external: "no" kolla_enable_tls_external: "no"
kolla_external_fqdn_cert: "{{ node_config_directory }}/certificates/haproxy.pem" kolla_external_fqdn_cert: "{{ node_config_directory }}/certificates/haproxy.pem"
kolla_external_fqdn_cacert: "{{ node_config_directory }}/certificates/haproxy-ca.crt"
#################### ####################

3
ansible/roles/common/templates/admin-openrc.sh.j2
View File

@ -6,3 +6,6 @@ export OS_USERNAME=admin
export OS_PASSWORD={{ keystone_admin_password }} export OS_PASSWORD={{ keystone_admin_password }}
export OS_AUTH_URL={{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}/v3 export OS_AUTH_URL={{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}/v3
export OS_IDENTITY_API_VERSION=3 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 %}