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/nova/defaults/main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'ansible/roles/nova/defaults') diff --git a/ansible/roles/nova/defaults/main.yml b/ansible/roles/nova/defaults/main.yml index 707e4950f..01bdaea9c 100644 --- a/ansible/roles/nova/defaults/main.yml +++ b/ansible/roles/nova/defaults/main.yml @@ -19,11 +19,11 @@ nova_cache_mode: "{{ ceph_nova_cache_mode }}" #################### nova_database_name: "nova" nova_database_user: "nova" -nova_database_address: "{{ kolla_internal_address }}" +nova_database_address: "{{ kolla_internal_fqdn }}" nova_api_database_name: "nova_api" nova_api_database_user: "nova_api" -nova_api_database_address: "{{ kolla_internal_address }}" +nova_api_database_address: "{{ kolla_internal_fqdn }}" #################### # Docker @@ -67,9 +67,9 @@ nova_compute_ironic_image_full: "{{ nova_compute_ironic_image }}:{{ nova_compute #################### # OpenStack #################### -nova_public_address: "{{ kolla_external_address }}" -nova_admin_address: "{{ kolla_internal_address }}" -nova_internal_address: "{{ kolla_internal_address }}" +nova_public_address: "{{ kolla_external_fqdn }}" +nova_admin_address: "{{ kolla_internal_fqdn }}" +nova_internal_address: "{{ kolla_internal_fqdn }}" nova_logging_debug: "{{ openstack_logging_debug }}" -- cgit v1.2.3