Skip to content

Commit e045c16

Browse files
Remove unused undercloud ctlplane_vip from scenario files
The undercloud ctlplane_vip was set in scenario files but never used by any service endpoint — they all use ctlplane_ip instead. The consumer in ci-framework's adoption_osp_deploy role has been removed in openstack-k8s-operators/ci-framework#4019. This removes the now-unnecessary ctlplane_vip key from the undercloud section in all 12 scenario files. The overcloud VIPs in vips_data.yaml files are unrelated and remain untouched. Depends-On: openstack-k8s-operators/ci-framework#4019 Related-Issue: #OSPRH-17418 Co-authored-by: Cursor <cursoragent@cursor.com>
1 parent 8ad3d8b commit e045c16

12 files changed

Lines changed: 0 additions & 12 deletions

scenarios/bgp-l3-xl.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ undercloud:
114114
value: false
115115
undercloud_parameters_override: "bgp-l3-xl/hieradata_overrides_undercloud.yaml"
116116
undercloud_parameters_defaults: "bgp-l3-xl/undercloud_parameter_defaults.yaml"
117-
ctlplane_vip: 192.168.122.98
118117
cloud_domain: "example.com"
119118
hostname_groups_map:
120119
# map ansible groups in the inventory to role hostname format for

scenarios/dcn_nostorage.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ undercloud:
6767
value: 192.168.144.200,192.168.144.220
6868
undercloud_parameters_override: "dcn_nostorage/hieradata_overrides_undercloud.yaml"
6969
undercloud_parameters_defaults: "dcn_nostorage/undercloud_parameter_defaults.yaml"
70-
ctlplane_vip: 192.168.122.98
7170
cloud_domain: "example.com"
7271
hostname_groups_map:
7372
# map ansible groups in the inventory to role hostname format for

scenarios/dcn_storage.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ undercloud:
7171
value: 192.168.144.200,192.168.144.220
7272
undercloud_parameters_override: "dcn_storage/hieradata_overrides_undercloud.yaml"
7373
undercloud_parameters_defaults: "dcn_storage/undercloud_parameter_defaults.yaml"
74-
ctlplane_vip: 192.168.122.98
7574
cloud_domain: "example.com"
7675
hostname_groups_map:
7776
# map ansible groups in the inventory to role hostname format for

scenarios/hci.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ undercloud:
2121
value: false
2222
undercloud_parameters_override: "hci/hieradata_overrides_undercloud.yaml"
2323
undercloud_parameters_defaults: "hci/undercloud_parameter_defaults.yaml"
24-
ctlplane_vip: 192.168.122.98
2524
cloud_domain: "ooo.test"
2625
tlse: true
2726
enable_keystone_ldap: true

scenarios/uni01alpha.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ undercloud:
2121
value: false
2222
undercloud_parameters_override: "uni01alpha/hieradata_overrides_undercloud.yaml"
2323
undercloud_parameters_defaults: "uni01alpha/undercloud_parameter_defaults.yaml"
24-
ctlplane_vip: 192.168.122.101
2524
cloud_domain: "example.com"
2625
hostname_groups_map:
2726
# map ansible groups in the inventory to role hostname format for

scenarios/uni02beta.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ undercloud:
2121
value: false
2222
undercloud_parameters_override: "uni02beta/hieradata_overrides_undercloud.yaml"
2323
undercloud_parameters_defaults: "uni02beta/undercloud_parameter_defaults.yaml"
24-
ctlplane_vip: 192.168.122.101
2524
cloud_domain: "example.com"
2625
hostname_groups_map:
2726
# map ansible groups in the inventory to role hostname format for

scenarios/uni04delta-ipv6.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ undercloud:
2828

2929
undercloud_parameters_override: "uni04delta-ipv6/hieradata_overrides_undercloud.yaml"
3030
undercloud_parameters_defaults: "uni04delta-ipv6/undercloud_parameter_defaults.yaml"
31-
ctlplane_vip: 2620:cf:cf:aaaa::98
3231

3332
cloud_domain: "example.com"
3433
hostname_groups_map:

scenarios/uni04delta.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ undercloud:
2121
value: false
2222
undercloud_parameters_override: "uni04delta/hieradata_overrides_undercloud.yaml"
2323
undercloud_parameters_defaults: "uni04delta/undercloud_parameter_defaults.yaml"
24-
ctlplane_vip: 192.168.122.98
2524
cloud_domain: "example.com"
2625
hostname_groups_map:
2726
# map ansible groups in the inventory to role hostname format for

scenarios/uni05epsilon.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ undercloud:
2121
value: false
2222
undercloud_parameters_override: "uni05epsilon/hieradata_overrides_undercloud.yaml"
2323
undercloud_parameters_defaults: "uni05epsilon/undercloud_parameter_defaults.yaml"
24-
ctlplane_vip: 192.168.122.101
2524
routes: &sroutes
2625
- ip_netmask: 0.0.0.0/0
2726
next_hop: 192.168.122.1

scenarios/uni06zeta.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ undercloud:
2121
value: false
2222
undercloud_parameters_override: "uni06zeta/hieradata_overrides_undercloud.yaml"
2323
undercloud_parameters_defaults: "uni06zeta/undercloud_parameter_defaults.yaml"
24-
ctlplane_vip: 192.168.122.101
2524
cloud_domain: "example.com"
2625
hostname_groups_map:
2726
# map ansible groups in the inventory to role hostname format for

0 commit comments

Comments
 (0)