Deprecate kolla_internal_address variable

The "kolla_internal_address" variable is not documented or defined
anywhere.  When "kolla_internal_vip_address" is undefined, the error
message is about "kolla_internal_address", which will confuse operators.

This change deprecates "kolla_internal_address", and adds a default
value for "kolla_internal_vip_address" when "kolla_internal_address" is
undefined.

Change-Id: I09694b38420ea67896bb8cf4ffd7ce6f131af10e
Closes-Bug: #1864206
This commit is contained in:
chenxing 2020-04-16 11:59:53 +08:00 committed by Mark Goddard
parent d1e5de2120
commit b4603d9271
2 changed files with 7 additions and 1 deletions

View File

@ -32,7 +32,7 @@ kolla_base_distro: "centos"
# Valid options are [ binary, source ] # Valid options are [ binary, source ]
kolla_install_type: "binary" kolla_install_type: "binary"
kolla_internal_vip_address: "{{ kolla_internal_address }}" kolla_internal_vip_address: "{{ kolla_internal_address | default('') }}"
kolla_internal_fqdn: "{{ kolla_internal_vip_address }}" kolla_internal_fqdn: "{{ kolla_internal_vip_address }}"
kolla_external_vip_address: "{{ kolla_internal_vip_address }}" kolla_external_vip_address: "{{ kolla_internal_vip_address }}"
kolla_same_external_internal_vip: "{{ kolla_external_vip_address == kolla_internal_vip_address }}" kolla_same_external_internal_vip: "{{ kolla_external_vip_address == kolla_internal_vip_address }}"

View File

@ -0,0 +1,6 @@
---
deprecations:
- |
The variable ``kolla_internal_address`` is deprecated. This variable is
used only as the default value for ``kolla_internal_vip_address``, and is
not documented.