Remove the use of mgmt_ip field in host table
This commit is to remove the usage of mgmt_ip in the host table in favor of either controller FQDN for AIO-SX or the management address configured in the address table. The host hiera data yaml filename is renamed from host ip address to hostname. Test Plan: PASS: AIO-SX and AIO-DX virtualbox installation IPv4/IPv6 PASS: Standard virtualbox installation IPv6 PASS: DC virtualbox installation IPv4 ( AIO-SX/DX subclouds ) PASS: AIO-SX and AIO-DX installation IPv4/IPv6 PASS: AIO-DX plus installation IPv6 PASS: DC IPv6 and subcloud AIO-SX PASS: AIO-DX host-swact PASS: DC IPv4 virtualbox with subcloud AIO-DX and AIO-DX PASS: AIO-SX to AIO-DX migration PASS: netstat -tupl ( no services are using the MGMT IP address ) PASS: Ran sanity/regression tests PASS: Backup and Restore for AIO-SX/AIO-DX / DC subcloud AIO-SX PASS: DC subcloud Rehome IPv6 Story: 2010722 Task: 48681 Depends-on: https://review.opendev.org/c/starlingx/config/+/890788 Change-Id: Idc54de47d01f3b394d8d3c9faea31aa100fd0896 Signed-off-by: Teresa Ho <teresa.ho@windriver.com>
This commit is contained in:
committed by
Fabiano Correa Mercer
parent
e1d5a66c17
commit
d21a4424d4
@@ -296,7 +296,7 @@
|
||||
command: >
|
||||
/usr/local/bin/puppet-manifest-apply.sh
|
||||
{{ hieradata_workdir }}
|
||||
{{ derived_network_params.controller_0_address }}
|
||||
controller-0
|
||||
controller ansible_bootstrap
|
||||
{{ hieradata_workdir }}/runtime.yaml > {{ manifest_apply_log }}
|
||||
register: bootstrap_manifest
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
command: >
|
||||
/usr/local/bin/puppet-manifest-apply.sh
|
||||
{{ hieradata_workdir }}
|
||||
{{ prev_controller_0_address }}
|
||||
controller-0
|
||||
controller runtime /tmp/etcd.yml
|
||||
register: etcd_manifest
|
||||
environment:
|
||||
|
||||
@@ -1260,7 +1260,6 @@ def populate_controller_config(client):
|
||||
values = {
|
||||
'personality': sysinv_constants.CONTROLLER,
|
||||
'hostname': CONF.get('BOOTSTRAP_CONFIG', 'CONTROLLER_HOSTNAME'),
|
||||
'mgmt_ip': CONF.get('BOOTSTRAP_CONFIG', 'CONTROLLER_0_ADDRESS'),
|
||||
'mgmt_mac': mgmt_mac,
|
||||
'administrative': sysinv_constants.ADMIN_LOCKED,
|
||||
'operational': sysinv_constants.OPERATIONAL_DISABLED,
|
||||
|
||||
@@ -59,7 +59,7 @@
|
||||
command: >-
|
||||
/usr/local/bin/puppet-manifest-apply.sh
|
||||
{{ hieradata_workdir }}
|
||||
localhost
|
||||
controller-0
|
||||
controller
|
||||
restore
|
||||
{{ hieradata_workdir }}/runtime.yaml
|
||||
|
||||
@@ -109,7 +109,7 @@
|
||||
command: >
|
||||
/usr/local/bin/puppet-manifest-apply.sh
|
||||
{{ puppet_permdir }}/hieradata/
|
||||
{{ derived_network_params.controller_0_address }}
|
||||
controller-0
|
||||
controller runtime /tmp/ceph-mon.yml
|
||||
controller ansible_bootstrap > {{ ceph_mon_manifest_apply_log }}
|
||||
register: ceph_mon_manifest
|
||||
|
||||
@@ -698,7 +698,7 @@
|
||||
command: >
|
||||
/usr/local/bin/puppet-manifest-apply.sh
|
||||
{{ puppet_permdir }}/hieradata/
|
||||
{{ derived_network_params.controller_0_address }}
|
||||
controller-0
|
||||
controller runtime /tmp/apiserver.yml
|
||||
environment:
|
||||
LC_ALL: "en_US.UTF-8"
|
||||
|
||||
Reference in New Issue
Block a user