Skip to content

[adoption_osp_deploy] Remove unused undercloud ctlplane_vip#4019

Merged
openshift-merge-bot[bot] merged 1 commit into
openstack-k8s-operators:mainfrom
ciecierski:remove-undercloud-ctlplane-vip
Jul 1, 2026
Merged

[adoption_osp_deploy] Remove unused undercloud ctlplane_vip#4019
openshift-merge-bot[bot] merged 1 commit into
openstack-k8s-operators:mainfrom
ciecierski:remove-undercloud-ctlplane-vip

Conversation

@ciecierski

@ciecierski ciecierski commented Jun 26, 2026

Copy link
Copy Markdown
Contributor

Summary

  • Remove the _ctlplane_vip variable from prepare_undercloud.yml that was set from cifmw_adoption_osp_deploy_scenario.undercloud.ctlplane_vip
  • Remove the VIP CIDR detection block and VIP address line from both os_net_config_undercloud.yml.j2 and os_net_config_undercloud_bgp.yml.j2 templates
  • No service endpoints use this VIP — they all use _ctlplane_ip — and the dependency OSPRH-12150 (TLS-e for adoption) is closed without needing it

Merge ordering

This PR (consumer removal) must merge before the corresponding data-plane-adoption PR that removes the ctlplane_vip key from scenario files. If the scenario files lose ctlplane_vip first, the Ansible task referencing cifmw_adoption_osp_deploy_scenario.undercloud.ctlplane_vip will fail with an undefined variable error.

Test plan

  • Zuul check pipeline passes (adoption jobs exercise these templates)
  • Combined test with data-plane-adoption PR via Depends-On once that PR is created

Related-Issue: #OSPRH-17418

Made with Cursor

@centosinfra-prod-github-app

Copy link
Copy Markdown

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://gateway-cloud-softwarefactory.apps.ocp.cloud.ci.centos.org/zuul/t/rdoproject.org/buildset/91680bc55a344a3ea5d02fa0c0a179ae

openstack-k8s-operators-content-provider FAILURE in 11m 53s
⚠️ podified-multinode-edpm-deployment-crc SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider
⚠️ cifmw-crc-podified-edpm-baremetal SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider
⚠️ cifmw-crc-podified-edpm-baremetal-minor-update SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider
✔️ cifmw-pod-zuul-files SUCCESS in 6m 21s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 9m 16s
✔️ cifmw-pod-pre-commit SUCCESS in 9m 43s
✔️ cifmw-molecule-adoption_osp_deploy SUCCESS in 5m 06s

@ciecierski

ciecierski commented Jun 29, 2026

Copy link
Copy Markdown
Contributor Author

recheck

@ciecierski ciecierski requested review from fyanac and xek June 29, 2026 08:18
@ciecierski

Copy link
Copy Markdown
Contributor Author

recheck

The `_ctlplane_vip` variable was set from
`cifmw_adoption_osp_deploy_scenario.undercloud.ctlplane_vip` and injected
into the undercloud os-net-config templates, but no service endpoints
actually use this VIP -- they all use `_ctlplane_ip`. The dependency
OSPRH-12150 (TLS-e for adoption) is now closed without needing the VIP.

Remove the variable assignment from `prepare_undercloud.yml` and the
VIP CIDR detection block plus address line from both the standard and
BGP os-net-config templates.

Related-Issue: #OSPRH-17418
Co-authored-by: Cursor <cursoragent@cursor.com>
Signed-off-by: Mikołaj Ciecierski <mikolaj.ciecierski@redhat.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
@ciecierski ciecierski force-pushed the remove-undercloud-ctlplane-vip branch from d4b9eb4 to b01b624 Compare June 30, 2026 16:44

@michburk michburk left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm
/approve

@openshift-ci

openshift-ci Bot commented Jul 1, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: michburk

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci Bot added the approved label Jul 1, 2026
@openshift-merge-bot openshift-merge-bot Bot merged commit 56153d4 into openstack-k8s-operators:main Jul 1, 2026
9 checks passed
openshift-merge-bot Bot pushed a commit to openstack-k8s-operators/data-plane-adoption that referenced this pull request Jul 2, 2026
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>
openshift-merge-bot Bot pushed a commit to openstack-k8s-operators/data-plane-adoption that referenced this pull request Jul 2, 2026
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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants