diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-27 17:50:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-27 17:50:52 +0000 |
| commit | c81097df8b0525bcff9df875f38bbfe2ab83be3f (patch) | |
| tree | 47a46491b4e50cb7ceac5d1845bc89443f4e326e /ansible/group_vars/all.yml | |
| parent | 3a10f2d6e9cc2877890d29223c923b36f36d6a7a (diff) | |
| parent | d3cfb2052a7321606e3a46fd6846f776d28afd86 (diff) | |
| download | kolla-c81097df8b0525bcff9df875f38bbfe2ab83be3f.tar.gz kolla-c81097df8b0525bcff9df875f38bbfe2ab83be3f.zip | |
Merge "Change kolla_internal_address variable"
Diffstat (limited to 'ansible/group_vars/all.yml')
| -rw-r--r-- | ansible/group_vars/all.yml | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 5549688af..1a1203f7e 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -22,9 +22,10 @@ kolla_base_distro: "centos" # Valid options are [ binary, source ] kolla_install_type: "binary" -# Value set in the public_url endpoint in Keystone -kolla_external_vip_address: "{{ kolla_internal_address }}" -kolla_external_address: "{{ kolla_external_vip_address }}" +kolla_internal_vip_address: "{{ kolla_internal_address }}" +kolla_internal_fqdn: "{{ kolla_internal_address }}" +kolla_external_vip_address: "{{ kolla_internal_vip_address }}" +kolla_external_fqdn: "{{ kolla_internal_fqdn if kolla_external_vip_address == kolla_internal_vip_address else kolla_external_vip_address }}" kolla_enable_sanity_checks: "no" @@ -34,7 +35,7 @@ kolla_enable_sanity_glance: "{{ kolla_enable_sanity_checks }}" #################### # Database options #################### -database_address: "{{ kolla_internal_address }}" +database_address: "{{ kolla_internal_fqdn }}" database_user: "root" @@ -152,7 +153,7 @@ nova_console: "novnc" # OpenStack authentication string. You should only need to override these if you # are changing the admin tenant/project or user. openstack_auth: - auth_url: "{{ admin_protocol }}://{{ kolla_internal_address }}:{{ keystone_admin_port }}" + auth_url: "{{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}" username: "admin" password: "{{ keystone_admin_password }}" project_name: "admin" @@ -160,7 +161,7 @@ openstack_auth: # This shouldn't be needed for long. It is only temporary until we get the # ansible modules sorted out openstack_auth_v2: - auth_url: "{{ admin_protocol }}://{{ kolla_internal_address }}:{{ keystone_admin_port }}/v2.0" + auth_url: "{{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}/v2.0" username: "admin" password: "{{ keystone_admin_password }}" project_name: "admin" @@ -206,7 +207,7 @@ rabbitmq_user: "openstack" # HAProxy options #################### haproxy_user: "openstack" -haproxy_enable_external_vip: "{{ 'no' if kolla_external_vip_address == kolla_internal_address else 'yes' }}" +haproxy_enable_external_vip: "{{ 'no' if kolla_external_vip_address == kolla_internal_vip_address else 'yes' }}" ################################# |
