Skip to content

[adoption_osp_deploy] Remove unused undercloud ctlplane_vip #4019

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Jul 1, 2026
Merged

[adoption_osp_deploy] Remove unused undercloud ctlplane_vip #4019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion roles/adoption_osp_deploy/tasks/prepare_undercloud.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@
_ctlplane_undercloud_net: "{{ _undercloud_net.networks[_ctlplane_net_name] }}"
_ctlplane_net: "{{ cifmw_networking_env_definition.networks[_ctlplane_net_name] }}"
_ctlplane_ip: "{{ _ctlplane_undercloud_net[ip_version|default('ip_v4')] }}"
_ctlplane_vip: "{{ cifmw_adoption_osp_deploy_scenario.undercloud.ctlplane_vip }}"
_dns_server: "{{ _ctlplane_net[dns_version|default('dns_v4')] }}"
_gateway_ip: "{{ _ctlplane_net[gw_version|default('gw_v4')] }}"
_interface_mtu: "{{ _ctlplane_undercloud_net.mtu }}"
Expand Down
6 changes: 0 additions & 6 deletions roles/adoption_osp_deploy/templates/os_net_config_undercloud.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,6 @@
{% else %}
{% set _ctlplane_ip_cidr = 32 %}
{% endif %}
{% if ':' in _ctlplane_vip %}
{% set _ctlplane_vip_cidr = 128 %}
{% else %}
{% set _ctlplane_vip_cidr = 32 %}
{% endif %}
network_config:
- type: ovs_bridge
name: br-ctlplane
Expand All @@ -25,7 +20,6 @@ network_config:
addresses:
- ip_netmask: {{ _ctlplane_ip }}/{{ _ctlplane_cidr }}
- ip_netmask: {{ _ctlplane_ip }}/{{ _ctlplane_ip_cidr }}
- ip_netmask: {{ _ctlplane_vip }}/{{ _ctlplane_vip_cidr }}
{% if cifmw_adoption_osp_deploy_scenario.undercloud.routes is defined %}
{%- for route in cifmw_adoption_osp_deploy_scenario.undercloud.routes %}
routes:
Expand Down
6 changes: 0 additions & 6 deletions roles/adoption_osp_deploy/templates/os_net_config_undercloud_bgp.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,6 @@
{% else %}
{% set _ctlplane_ip_cidr = 32 %}
{% endif %}
{% if ':' in _ctlplane_vip %}
{% set _ctlplane_vip_cidr = 128 %}
{% else %}
{% set _ctlplane_vip_cidr = 32 %}
{% endif %}
network_config:
- type: interface
name: nic1
Expand All @@ -28,7 +23,6 @@ network_config:
addresses:
- ip_netmask: {{ _ctlplane_ip }}/{{ _ctlplane_cidr }}
- ip_netmask: {{ _ctlplane_ip }}/{{ _ctlplane_ip_cidr }}
- ip_netmask: {{ _ctlplane_vip }}/{{ _ctlplane_vip_cidr }}
routes:
- ip_netmask: 192.168.123.0/24
next_hop: 192.168.122.1
Expand Down
Loading