Remove OCPBUGS-67159 workaround

The upstream OCP bug (IP/port collision in CAPO machine network)
is fixed and backported to 4.19-4.22. The workaround hardcoded
api_vip/ingress_vip in the adoption job definition and added a
conditional block in the IPI install-config template to use them.

Removes:
- adoption.yaml: api_vip and ingress_vip fields
- install-config-ipi.yaml.j2: conditional VIP injection block

Closes: OSPRH-25360

Assisted-By: Claude Code
Change-Id: Ie8061ad8ee2584d9311d7992b9a336666b12cf43
Signed-off-by: Itay Matza <imatza@redhat.com>

Author: imatza-rh

collection/stages/roles/install/templates/install-config-ipi.yaml.j2

@@ -59,11 +59,6 @@ platform:
         - subnet:
             name: "{{ installcfg_subnet.name }}"
     {%- else +%}
-    {%- if ocp_deployment_topology.api_vip is defined +%}
-    # Workaround for OCPBUGS-67159 (adoption uses pre-existing VIPs, not FIPs)
-    apiVIPs: ["{{ ocp_deployment_topology.api_vip }}"]
-    ingressVIPs: ["{{ ocp_deployment_topology.ingress_vip }}"]
-    {%- endif +%}
     externalNetwork:  "{{ installcfg_external_network }}"
     apiFloatingIP:     "{{ installcfg_api_floating_ip }}"
     ingressFloatingIP: "{{ installcfg_ingress_floating_ip }}"

jobs_definitions/adoption.yaml

@@ -45,6 +45,3 @@ ocp_deployment_topology:
   servergroups:
     master: "soft-anti-affinity"  # Required if number of computes < 3, otherwise can be anti-affinity
     worker: "soft-anti-affinity"  # Required if number of computes < 3, otherwise can be anti-affinity
-  # Workaround for OCPBUGS-67159
-  api_vip: "10.196.0.15"
-  ingress_vip: "10.196.0.17"