Skip to content

Comment out network vars in all.sample.yml to rely on role defaults#759

Merged
openshift-merge-bot[bot] merged 2 commits intoredhat-performance:mainfrom
mcornea:public_vlan_validation
Feb 18, 2026
Merged

Comment out network vars in all.sample.yml to rely on role defaults#759
openshift-merge-bot[bot] merged 2 commits intoredhat-performance:mainfrom
mcornea:public_vlan_validation

Conversation

@mcornea
Copy link
Collaborator

@mcornea mcornea commented Jan 21, 2026

Comment out the network variable definitions in all.sample.yml sothey fall through to role defaults and allow them to be dynamically set when public_vlan is set to true.

@akrzos
Copy link
Member

akrzos commented Jan 21, 2026

/test ?

@akrzos
Copy link
Member

akrzos commented Jan 21, 2026

/test deploy-mno

1 similar comment
@akrzos
Copy link
Member

akrzos commented Jan 21, 2026

/test deploy-mno

Copy link
Member

@akrzos akrzos left a comment

Choose a reason for hiding this comment

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

Needs some work

msg: "public_vlan is enabled but controlplane_network uses the default private range. Comment out controlplane_network and controlplane_network_prefix in all.yml to use public VLAN auto-configuration."
when:
- public_vlan | default(false)
- "'198.18.0.0/16' in controlplane_network"
Copy link
Member

Choose a reason for hiding this comment

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

Need to check if controlplane_network is defined first. However even worse is that it seems somehow the default in the following role in the networks.yml vars file is populated before it is used thus the value remains assigned when I was debugging the CI failure. Even if we then remove that definition, a later validation for controlplane_network to be a list will also fail. We should also move from fail to assert tasks as those better match the goal of validate vars perhaps before adding more validations.

Copy link
Collaborator Author

@mcornea mcornea Feb 17, 2026

Choose a reason for hiding this comment

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

I took another approach to comment all the network related variables in all.sample.yml and rely on the networks.yml defaults. This way the vars can be overridden automatically when public_vlan is set to true.

Comment out the network variable definitions in all.sample.yml so
they fall through to role defaults and allow them to be dynamically
set when public_vlan is set to true.

Signed-off-by: Marius Cornea <mcornea@redhat.com>
@mcornea mcornea changed the title Add public_vlan validation for controlplane_network private subnet Comment out network vars in all.sample.yml to rely on role defaults Feb 16, 2026
@mcornea
Copy link
Collaborator Author

mcornea commented Feb 16, 2026

/test deploy-mno

@mcornea mcornea force-pushed the public_vlan_validation branch from 7d9bff8 to c65c8e1 Compare February 17, 2026 14:47
@mcornea mcornea requested a review from akrzos February 17, 2026 14:47
Copy link
Member

@akrzos akrzos left a comment

Choose a reason for hiding this comment

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

LGTM

@openshift-ci openshift-ci bot added the lgtm label Feb 18, 2026
@openshift-ci
Copy link

openshift-ci bot commented Feb 18, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: akrzos

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-merge-bot openshift-merge-bot bot merged commit 975cf7b into redhat-performance:main Feb 18, 2026
1 check passed
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.

2 participants