From d3cfb2052a7321606e3a46fd6846f776d28afd86 Mon Sep 17 00:00:00 2001 From: SamYaple Date: Fri, 26 Feb 2016 01:02:25 +0000 Subject: Change kolla_internal_address variable Due to poor planning on our variable names we have a situation where we have "internal_address" which must be a VIP, but "external_address" which should be a DNS name. Now with two vips "external_vip_address" is a new variable. This corrects that issue by deprecating kolla_internal_address and replacing it with 4 nicely named variables. kolla_internal_vip_address kolla_internal_fqdn kolla_external_vip_address kolla_external_fqdn The default behaviour will remain the same, and the way the variable inheritance is setup the kolla_internal_address variable can still be set in globals.yml and propogate out to these 4 new variables like it normally would, but all reference to kolla_internal_address has been completely removed. Change-Id: I4556dcdbf4d91a8d2751981ef9c64bad44a719e5 Partially-Implements: blueprint ssl-kolla --- ansible/group_vars/all.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'ansible/group_vars/all.yml') 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' }}" ################################# -- cgit v1.2.3