Skip to content

Remove unused undercloud ctlplane_vip from scenario files#1424

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

Remove unused undercloud ctlplane_vip from scenario files#1424
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 key from the undercloud: section in all 12 scenario files
  • The undercloud ctlplane_vip was never consumed by any service endpoint — all endpoints use ctlplane_ip instead
  • The consumer code in ci-framework's adoption_osp_deploy role is being removed in the companion PR

The overcloud VIPs defined in vips_data.yaml files are a separate concept and are not affected by this change.

Files changed

scenarios/hci.yaml, scenarios/uni01alpha.yaml, scenarios/uni02beta.yaml, scenarios/uni04delta.yaml, scenarios/uni04delta-ipv6.yaml, scenarios/uni05epsilon.yaml, scenarios/uni06zeta.yaml, scenarios/uni07eta.yaml, scenarios/uni09iota.yaml, scenarios/dcn_nostorage.yaml, scenarios/dcn_storage.yaml, scenarios/bgp-l3-xl.yaml

Test plan

  • Zuul check pipeline passes with Depends-On pulling in the ci-framework companion PR
  • Adoption jobs that exercise these scenarios complete successfully

Depends-On: openstack-k8s-operators/ci-framework#4019
Related-Issue: #OSPRH-17418

Made with Cursor

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>
@ciecierski ciecierski added the check-before-merge/depends-on Don't forget to check depends-on before merging label Jun 26, 2026
@ciecierski ciecierski requested review from fyanac, hjensas and jistr June 29, 2026 08:19
@jistr

jistr commented Jun 30, 2026

Copy link
Copy Markdown
Contributor

/lgtm

@ciecierski ciecierski removed the check-before-merge/depends-on Don't forget to check depends-on before merging label Jul 2, 2026
@ciecierski

Copy link
Copy Markdown
Contributor Author

depends-on ci-framework change is promoted to stable branch. change can be merged

@ciecierski

Copy link
Copy Markdown
Contributor Author

/approve

@openshift-ci

openshift-ci Bot commented Jul 2, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ciecierski

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 2, 2026
@openshift-merge-bot openshift-merge-bot Bot merged commit ed3d943 into openstack-k8s-operators:main Jul 2, 2026
5 checks passed
@ciecierski

Copy link
Copy Markdown
Contributor Author

/cherry-pick 18.0-fr6

@openshift-cherrypick-robot

Copy link
Copy Markdown

@ciecierski: new pull request created: #1435

Details

In response to this:

/cherry-pick 18.0-fr6

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

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