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/roles/neutron/defaults/main.yml | 8 ++++---- ansible/roles/neutron/tasks/register.yml | 6 +++--- ansible/roles/neutron/templates/metadata_agent.ini.j2 | 2 +- ansible/roles/neutron/templates/neutron.conf.j2 | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) (limited to 'ansible/roles/neutron') diff --git a/ansible/roles/neutron/defaults/main.yml b/ansible/roles/neutron/defaults/main.yml index 0c2e03fed..5b7887370 100644 --- a/ansible/roles/neutron/defaults/main.yml +++ b/ansible/roles/neutron/defaults/main.yml @@ -6,7 +6,7 @@ project_name: "neutron" #################### neutron_database_name: "neutron" neutron_database_user: "neutron" -neutron_database_address: "{{ kolla_internal_address }}" +neutron_database_address: "{{ kolla_internal_fqdn }}" #################### @@ -48,9 +48,9 @@ openvswitch_vswitchd_image_full: "{{ openvswitch_vswitchd_image }}:{{ openvswitc #################### # OpenStack #################### -neutron_public_address: "{{ kolla_external_address }}" -neutron_admin_address: "{{ kolla_internal_address }}" -neutron_internal_address: "{{ kolla_internal_address }}" +neutron_public_address: "{{ kolla_external_fqdn }}" +neutron_admin_address: "{{ kolla_internal_fqdn }}" +neutron_internal_address: "{{ kolla_internal_fqdn }}" neutron_logging_debug: "{{ openstack_logging_debug }}" diff --git a/ansible/roles/neutron/tasks/register.yml b/ansible/roles/neutron/tasks/register.yml index d400d6ca7..067fa5bf4 100644 --- a/ansible/roles/neutron/tasks/register.yml +++ b/ansible/roles/neutron/tasks/register.yml @@ -6,9 +6,9 @@ service_type=network description='Openstack Networking' endpoint_region={{ openstack_region_name }} - admin_url='{{ admin_protocol }}://{{ kolla_internal_address }}:{{ neutron_server_port }}' - internal_url='{{ internal_protocol }}://{{ kolla_internal_address }}:{{ neutron_server_port }}' - public_url='{{ public_protocol }}://{{ kolla_external_address }}:{{ neutron_server_port }}' + admin_url='{{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ neutron_server_port }}' + internal_url='{{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ neutron_server_port }}' + public_url='{{ public_protocol }}://{{ kolla_external_fqdn }}:{{ neutron_server_port }}' region_name={{ openstack_region_name }} auth={{ '{{ openstack_neutron_auth }}' }}" -e "{'openstack_neutron_auth':{{ openstack_neutron_auth }}}" diff --git a/ansible/roles/neutron/templates/metadata_agent.ini.j2 b/ansible/roles/neutron/templates/metadata_agent.ini.j2 index e6bba74d4..86f33b9d0 100644 --- a/ansible/roles/neutron/templates/metadata_agent.ini.j2 +++ b/ansible/roles/neutron/templates/metadata_agent.ini.j2 @@ -1,5 +1,5 @@ # metadata_agent.ini [DEFAULT] -nova_metadata_ip = {{ kolla_internal_address }} +nova_metadata_ip = {{ kolla_internal_fqdn }} nova_metadata_port = {{ nova_metadata_port }} metadata_proxy_shared_secret = {{ metadata_secret }} diff --git a/ansible/roles/neutron/templates/neutron.conf.j2 b/ansible/roles/neutron/templates/neutron.conf.j2 index 6a0f8a162..802611f03 100644 --- a/ansible/roles/neutron/templates/neutron.conf.j2 +++ b/ansible/roles/neutron/templates/neutron.conf.j2 @@ -34,7 +34,7 @@ core_plugin = ml2 service_plugins = router [nova] -auth_url = {{ internal_protocol }}://{{ kolla_internal_address }}:{{ keystone_admin_port }} +auth_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }} auth_type = password project_domain_id = default user_domain_id = default @@ -59,8 +59,8 @@ root_helper = sudo neutron-rootwrap /etc/neutron/rootwrap.conf connection = mysql+pymysql://{{ neutron_database_user }}:{{ neutron_database_password }}@{{ neutron_database_address }}/{{ neutron_database_name }} [keystone_authtoken] -auth_uri = {{ internal_protocol }}://{{ kolla_internal_address }}:{{ keystone_public_port }} -auth_url = {{ admin_protocol }}://{{ kolla_internal_address }}:{{ keystone_admin_port }} +auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }} +auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }} auth_type = password project_domain_id = default user_domain_id = default -- cgit v1.2.3