From b4603d927152f95848e56f6cf3ed4acd88baa377 Mon Sep 17 00:00:00 2001 From: chenxing Date: Thu, 16 Apr 2020 11:59:53 +0800 Subject: [PATCH] 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 --- ansible/group_vars/all.yml | 2 +- ...ve-kolla_internal_address-variable-d3674b6001498c52.yaml | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/remove-kolla_internal_address-variable-d3674b6001498c52.yaml diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index bca41fe50b..23496f22d7 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -32,7 +32,7 @@ kolla_base_distro: "centos" # Valid options are [ binary, source ] 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_external_vip_address: "{{ kolla_internal_vip_address }}" kolla_same_external_internal_vip: "{{ kolla_external_vip_address == kolla_internal_vip_address }}" diff --git a/releasenotes/notes/remove-kolla_internal_address-variable-d3674b6001498c52.yaml b/releasenotes/notes/remove-kolla_internal_address-variable-d3674b6001498c52.yaml new file mode 100644 index 0000000000..4e0f70b0e9 --- /dev/null +++ b/releasenotes/notes/remove-kolla_internal_address-variable-d3674b6001498c52.yaml @@ -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.