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 --- tools/deploy_aio.sh | 2 +- tools/openrc-example | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tools') diff --git a/tools/deploy_aio.sh b/tools/deploy_aio.sh index e5c773414..e6ef5a11e 100755 --- a/tools/deploy_aio.sh +++ b/tools/deploy_aio.sh @@ -53,7 +53,7 @@ function write_configs { --- kolla_base_distro: "${KOLLA_BASE}" kolla_install_type: "${KOLLA_TYPE}" -kolla_internal_address: "169.254.169.10" +kolla_internal_vip_address: "169.254.169.10" docker_restart_policy: "never" network_interface: "eth0" neutron_external_interface: "fake_interface" diff --git a/tools/openrc-example b/tools/openrc-example index 2dda3aed3..66b2fb7ba 100644 --- a/tools/openrc-example +++ b/tools/openrc-example @@ -1,6 +1,6 @@ # You can customize this to match your environment by replacing the variables: # keystone_admin_password -# kolla_internal_address +# kolla_internal_fqdn # keystone_admin_port export OS_PROJECT_DOMAIN_ID=default @@ -8,4 +8,4 @@ export OS_USER_DOMAIN_ID=default export OS_PROJECT_NAME=admin export OS_USERNAME=admin export OS_PASSWORD= -export OS_AUTH_URL=http://: +export OS_AUTH_URL=http://: -- cgit v1.2.3