diff options
| author | SamYaple <sam@yaple.net> | 2016-02-26 01:02:25 +0000 |
|---|---|---|
| committer | SamYaple <sam@yaple.net> | 2016-02-26 20:00:09 +0000 |
| commit | d3cfb2052a7321606e3a46fd6846f776d28afd86 (patch) | |
| tree | 5426cfb4e516be337e9b112e7a4a43a2db5c5268 /etc | |
| parent | 35830a65ef04f14a85cba50517c958674930a692 (diff) | |
| download | kolla-d3cfb2052a7321606e3a46fd6846f776d28afd86.tar.gz kolla-d3cfb2052a7321606e3a46fd6846f776d28afd86.zip | |
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
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/kolla/globals.yml | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index 885c80bc8..f286e96bf 100644 --- a/etc/kolla/globals.yml +++ b/etc/kolla/globals.yml @@ -18,21 +18,23 @@ # the hosts running keepalived for high-availability. When running an All-In-One # without haproxy and keepalived, this should be the first IP on your # 'network_interface' as set in the Networking section below. -kolla_internal_address: "10.10.10.254" +kolla_internal_vip_address: "10.10.10.254" -# The Public address used to communicate with OpenStack as set in the public_url -# for the endpoints that will be created. It defaults to kolla_internal_address -# but can be overridden in your globals.yml to a public address. It is up to the -# deployer to ensure that that public address maps to the environment correctly. -# It is recommended to use a DNS name as well, but not required. -#kolla_external_address: "{{ kolla_internal_address }}" +# This is the DNS name that maps to the kolla_internal_vip_address VIP. By +# default it is the same as kolla_internal_vip_address. +#kolla_internal_fqdn: "{{ kolla_internal_vip_address }}" # This should be a VIP, an unused IP on your network that will float between # the hosts running keepalived for high-availability. It defaults to the -# kolla_internal_address, allowing internal and external communication to -# share the same address. Specify a kolla_external_vip_address to -# separate internal and external requests between two VIPs. -#kolla_external_vip_address: "{{ kolla_internal_address }}" +# kolla_internal_vip_address, allowing internal and external communication to +# share the same address. Specify a kolla_external_vip_address to separate +# internal and external requests between two VIPs. +#kolla_external_vip_address: "{{ kolla_internal_vip_address }}" + +# The Public address used to communicate with OpenStack as set in the public_url +# for the endpoints that will be created. This DNS name should map to +# kolla_external_vip_address. +#kolla_external_fqdn: "{{ kolla_external_vip_address }}" #################### # Docker options |