[adoption_osp_deploy] Remove unused undercloud ctlplane_vip

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>

Author: 2 people

roles/adoption_osp_deploy/tasks/prepare_undercloud.yml

@@ -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 }}"

roles/adoption_osp_deploy/templates/os_net_config_undercloud.yml.j2

@@ -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
@@ -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:

roles/adoption_osp_deploy/templates/os_net_config_undercloud_bgp.yml.j2

@@ -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
@@ -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