Merge pull request #1040 from fyanac/adapt_to_ipv6

openshift-merge-bot[bot] · web-flow · commit dc794ac7c804 · 2025-09-22T17:56:04.000Z
Include ipv6 in dataplane repo
diff --git a/tests/roles/backend_services/templates/openstack_control_plane.j2 b/tests/roles/backend_services/templates/openstack_control_plane.j2
@@ -138,10 +138,15 @@ spec:
             metadata:
               annotations:
                 metallb.universe.tf/address-pool: internalapi
+                {% if ipv6_enabled | default(false) -%}
+                metallb.universe.tf/loadBalancerIPs: {{ internalapi_prefix_ipv6 | default('2620:cf:cf:bbbb') }}::55
+                {%- else -%}
                 metallb.universe.tf/loadBalancerIPs: {{ internalapi_prefix | default('172.17.0') }}.85
+                {%- endif %}
+
             spec:
               type: LoadBalancer
-{% set ind = {'val': 86} %}
+{% set ind = {'val': 56 if ipv6_enabled | default(false) else 86} %}
 {% for cell in renamed_cells %}
       rabbitmq-{{ cell }}:
         persistence:
@@ -151,7 +156,12 @@ spec:
             metadata:
               annotations:
                 metallb.universe.tf/address-pool: internalapi
+                {% if ipv6_enabled | default(false) -%}
+                metallb.universe.tf/loadBalancerIPs: {{ internalapi_prefix_ipv6 | default('2620:cf:cf:bbbb') }}::{{ ind.val }}
+                {%- else -%}
                 metallb.universe.tf/loadBalancerIPs: {{ internalapi_prefix | default('172.17.0') }}.{{ ind.val }}
+                {%- endif %}
+
             spec:
               type: LoadBalancer
 {% set _ = ind.update({'val': ind.val + 1}) %}
diff --git a/tests/roles/barbican_adoption/defaults/main.yaml b/tests/roles/barbican_adoption/defaults/main.yaml
@@ -26,7 +26,12 @@ barbican_patch: |
                   annotations:
                     metallb.universe.tf/address-pool: internalapi
                     metallb.universe.tf/allow-shared-ip: internalapi
+                    {% if ipv6_enabled | default(false) -%}
+                    metallb.universe.tf/loadBalancerIPs: {{ internalapi_prefix_ipv6 | default('2620:cf:cf:bbbb') }}::50
+                    {%- else -%}
                     metallb.universe.tf/loadBalancerIPs: {{ internalapi_prefix | default('172.17.0') }}.80
+                    {%- endif %}
+
                 spec:
                   type: LoadBalancer
         barbicanWorker:
diff --git a/tests/roles/cinder_adoption/defaults/main.yaml b/tests/roles/cinder_adoption/defaults/main.yaml
@@ -21,7 +21,12 @@ cinder_api_patch: |
                   annotations:
                     metallb.universe.tf/address-pool: internalapi
                     metallb.universe.tf/allow-shared-ip: internalapi
+                    {% if ipv6_enabled | default(false) -%}
+                    metallb.universe.tf/loadBalancerIPs: {{ internalapi_prefix_ipv6 | default('2620:cf:cf:bbbb') }}::50
+                    {%- else -%}
                     metallb.universe.tf/loadBalancerIPs: {{ internalapi_prefix | default('172.17.0') }}.80
+                    {%- endif %}
+
                 spec:
                   type: LoadBalancer
         cinderScheduler:
diff --git a/tests/roles/common_defaults/defaults/main.yaml b/tests/roles/common_defaults/defaults/main.yaml
@@ -2,6 +2,11 @@
 # sensitive data.
 use_no_log: false
 
+# Network configuration for IPv4/IPv6 support
+ipv6_enabled: false
+internalapi_prefix: "172.17.0"
+internalapi_prefix_ipv6: "2620:cf:cf:bbbb"
+
 # Whether the adopted node will host compute services
 compute_adoption: true
 
@@ -133,7 +138,7 @@ mariadb_copy_shell_vars_src: |-
   MARIADB_CLIENT_ANNOTATIONS={{ deploy_ctlplane_ospdo | default(false) | bool | ternary("-n $NAMESPACE", "--annotations=k8s.v1.cni.cncf.io/networks=internalapi") }}
   MARIADB_RUN_OVERRIDES={{ deploy_ctlplane_ospdo | default(false) | bool | ternary("--overrides=${RUN_OVERRIDES} $MARIADB_CLIENT_ANNOTATIONS {{ mysql_client_override }}", "$MARIADB_CLIENT_ANNOTATIONS") }}
 
-  OSPDO_MARIADB_CLIENT_ANNOTATIONS='[{"name": "internalapi-static","ips": ["172.17.0.99/24"]}]'
+  OSPDO_MARIADB_CLIENT_ANNOTATIONS='[{"name": "internalapi-static","ips": ["{% if ipv6_enabled | default(false) %}{{ internalapi_prefix_ipv6 | default('2620:cf:cf:bbbb') }}::99/64{% else %}{{ internalapi_prefix | default('172.17.0') }}.99/24{% endif %}"]}]'
 
   {{ pull_openstack_configuration_ssh_shell_vars }}
 
diff --git a/tests/roles/dataplane_adoption/defaults/main.yaml b/tests/roles/dataplane_adoption/defaults/main.yaml
@@ -2,6 +2,11 @@
 # must match those configured for the source cloud
 supported_backup_backends: []
 supported_volume_backends: []
+
+# Network configuration for IPv4/IPv6 support
+ipv6_enabled: false
+ctlplane_prefix: "192.168.122"
+ctlplane_prefix_ipv6: "2620:cf:cf:aaaa"
 edpm_networker_deploy: false
 configure_ipam: true
 libvirt_password: ''
@@ -152,7 +157,7 @@ edpm_network_config_template: |
   {% endraw %}
 neutron_physical_bridge_name: br-ctlplane
 neutron_public_interface_name: "{{ dataplane_public_iface | default('eth0') }}"
-edpm_sshd_allowed_ranges: "{{ ['192.168.122.0/24'] if dataplane_os_net_config_set_route|default(true)|bool else ['0.0.0.0/0'] }}"
+edpm_sshd_allowed_ranges: "{% if ipv6_enabled | default(false) %}{{ [ctlplane_prefix_ipv6 | default('fd00:aaaa') + '::/64'] if dataplane_os_net_config_set_route|default(true)|bool else ['::/0'] }}{% else %}{{ [ctlplane_prefix | default('192.168.122') + '.0/24'] if dataplane_os_net_config_set_route|default(true)|bool else ['0.0.0.0/0'] }}{% endif %}"
 edpm_neutron_sriov_agent_enabled: true
 edpm_neutron_dhcp_agent_enabled: true
 nova_libvirt_backend: local
diff --git a/tests/roles/glance_adoption/templates/glance_ceph.yaml.j2 b/tests/roles/glance_adoption/templates/glance_ceph.yaml.j2
@@ -26,7 +26,12 @@ spec:
                   annotations:
                     metallb.universe.tf/address-pool: internalapi
                     metallb.universe.tf/allow-shared-ip: internalapi
+                    {% if ipv6_enabled | default(false) -%}
+                    metallb.universe.tf/loadBalancerIPs: {{ internalapi_prefix_ipv6 | default('2620:cf:cf:bbbb') }}::50
+                    {%- else -%}
                     metallb.universe.tf/loadBalancerIPs: {{ internalapi_prefix | default('172.17.0') }}.80
+                    {%- endif %}
+
                 spec:
                   type: LoadBalancer
           networkAttachments:
diff --git a/tests/roles/glance_adoption/templates/glance_cinder.yaml.j2 b/tests/roles/glance_adoption/templates/glance_cinder.yaml.j2
@@ -33,7 +33,12 @@ spec:
                     metallb.universe.tf/address-pool: internalapi
                     metallb.universe.tf/allow-shared-ip: internalapi
 {% endraw %}
+                    {% if ipv6_enabled | default(false) -%}
+                    metallb.universe.tf/loadBalancerIPs: {{ internalapi_prefix_ipv6 | default('2620:cf:cf:bbbb') }}::50
+                    {%- else -%}
                     metallb.universe.tf/loadBalancerIPs: {{ internalapi_prefix | default('172.17.0') }}.80
+                    {%- endif %}
+
                 spec:
                   type: LoadBalancer
           networkAttachments:
diff --git a/tests/roles/glance_adoption/templates/glance_nfs.yaml.j2 b/tests/roles/glance_adoption/templates/glance_nfs.yaml.j2
@@ -22,7 +22,12 @@ spec:
                   annotations:
                     metallb.universe.tf/address-pool: internalapi
                     metallb.universe.tf/allow-shared-ip: internalapi
+                    {% if ipv6_enabled | default(false) -%}
+                    metallb.universe.tf/loadBalancerIPs: {{ internalapi_prefix_ipv6 | default('2620:cf:cf:bbbb') }}::50
+                    {%- else -%}
                     metallb.universe.tf/loadBalancerIPs: {{ internalapi_prefix | default('172.17.0') }}.80
+                    {%- endif %}
+
                 spec:
                   type: LoadBalancer
           networkAttachments:
diff --git a/tests/roles/glance_adoption/templates/glance_swift.yaml.j2 b/tests/roles/glance_adoption/templates/glance_swift.yaml.j2
@@ -32,7 +32,12 @@ spec:
                     metallb.universe.tf/address-pool: internalapi
                     metallb.universe.tf/allow-shared-ip: internalapi
 {% endraw %}
+                    {% if ipv6_enabled | default(false) -%}
+                    metallb.universe.tf/loadBalancerIPs: {{ internalapi_prefix_ipv6 | default('2620:cf:cf:bbbb') }}::50
+                    {%- else -%}
                     metallb.universe.tf/loadBalancerIPs: {{ internalapi_prefix | default('172.17.0') }}.80
+                    {%- endif %}
+
                 spec:
                   type: LoadBalancer
           networkAttachments:
diff --git a/tests/roles/keystone_adoption/defaults/main.yaml b/tests/roles/keystone_adoption/defaults/main.yaml
@@ -17,7 +17,12 @@ keystone_patch: |
                 annotations:
                   metallb.universe.tf/address-pool: internalapi
                   metallb.universe.tf/allow-shared-ip: internalapi
+                  {% if ipv6_enabled | default(false) -%}
+                  metallb.universe.tf/loadBalancerIPs: {{ internalapi_prefix_ipv6 | default('2620:cf:cf:bbbb') }}::50
+                  {%- else -%}
                   metallb.universe.tf/loadBalancerIPs: {{ internalapi_prefix | default('172.17.0') }}.80
+                  {%- endif %}
+
               spec:
                 type: LoadBalancer
         databaseInstance: openstack
diff --git a/tests/roles/manila_adoption/templates/manila_cephfs.yaml.j2 b/tests/roles/manila_adoption/templates/manila_cephfs.yaml.j2
@@ -25,7 +25,12 @@ spec:
                 annotations:
                   metallb.universe.tf/address-pool: internalapi
                   metallb.universe.tf/allow-shared-ip: internalapi
+                  {% if ipv6_enabled | default(false) -%}
+                  metallb.universe.tf/loadBalancerIPs: {{ internalapi_prefix_ipv6 | default('2620:cf:cf:bbbb') }}::50
+                  {%- else -%}
                   metallb.universe.tf/loadBalancerIPs: {{ internalapi_prefix | default('172.17.0') }}.80
+                  {%- endif %}
+
               spec:
                 type: LoadBalancer
       manilaScheduler:
diff --git a/tests/roles/manila_adoption/templates/manila_netapp.yaml.j2 b/tests/roles/manila_adoption/templates/manila_netapp.yaml.j2
@@ -21,7 +21,12 @@ spec:
                 annotations:
                   metallb.universe.tf/address-pool: internalapi
                   metallb.universe.tf/allow-shared-ip: internalapi
+                  {% if ipv6_enabled | default(false) -%}
+                  metallb.universe.tf/loadBalancerIPs: {{ internalapi_prefix_ipv6 | default('2620:cf:cf:bbbb') }}::50
+                  {%- else -%}
                   metallb.universe.tf/loadBalancerIPs: {{ internalapi_prefix | default('172.17.0') }}.80
+                  {%- endif %}
+
               spec:
                 type: LoadBalancer
       manilaScheduler:
diff --git a/tests/roles/neutron_adoption/defaults/main.yaml b/tests/roles/neutron_adoption/defaults/main.yaml
@@ -16,7 +16,12 @@ neutron_config_patch: |
                 annotations:
                   metallb.universe.tf/address-pool: internalapi
                   metallb.universe.tf/allow-shared-ip: internalapi
+                  {% if ipv6_enabled | default(false) -%}
+                  metallb.universe.tf/loadBalancerIPs: {{ internalapi_prefix_ipv6 | default('2620:cf:cf:bbbb') }}::50
+                  {%- else -%}
                   metallb.universe.tf/loadBalancerIPs: {{ internalapi_prefix | default('172.17.0') }}.80
+                  {%- endif %}
+
               spec:
                 type: LoadBalancer
         databaseInstance: openstack
diff --git a/tests/roles/nova_adoption/defaults/main.yaml b/tests/roles/nova_adoption/defaults/main.yaml
@@ -21,7 +21,12 @@ nova_libvirt_patch: |
                       annotations:
                         metallb.universe.tf/address-pool: internalapi
                         metallb.universe.tf/allow-shared-ip: internalapi
-                        metallb.universe.tf/loadBalancerIPs: 172.17.0.$(( 79 + ${CELL##*cell} ))
+                        {% if ipv6_enabled | default(false) -%}
+                        metallb.universe.tf/loadBalancerIPs: {{ internalapi_prefix_ipv6 | default('2620:cf:cf:bbbb') }}::$(( 49 + ${CELL##*cell} ))
+                        {%- else -%}
+                        metallb.universe.tf/loadBalancerIPs: {{ internalapi_prefix | default('172.17.0') }}.$(( 79 + ${CELL##*cell} ))
+                        {%- endif %}
+
                     spec:
                       type: LoadBalancer
               customServiceConfig: |
@@ -51,7 +56,12 @@ nova_libvirt_patch: |
                   annotations:
                     metallb.universe.tf/address-pool: internalapi
                     metallb.universe.tf/allow-shared-ip: internalapi
+                    {% if ipv6_enabled | default(false) -%}
+                    metallb.universe.tf/loadBalancerIPs: {{ internalapi_prefix_ipv6 | default('2620:cf:cf:bbbb') }}::50
+                    {%- else -%}
                     metallb.universe.tf/loadBalancerIPs: {{ internalapi_prefix | default('172.17.0') }}.80
+                    {%- endif %}
+
                 spec:
                   type: LoadBalancer
           customServiceConfig: |
@@ -65,7 +75,12 @@ nova_libvirt_patch: |
                 annotations:
                   metallb.universe.tf/address-pool: internalapi
                   metallb.universe.tf/allow-shared-ip: internalapi
+                  {% if ipv6_enabled | default(false) -%}
+                  metallb.universe.tf/loadBalancerIPs: {{ internalapi_prefix_ipv6 | default('2620:cf:cf:bbbb') }}::50
+                  {%- else -%}
                   metallb.universe.tf/loadBalancerIPs: {{ internalapi_prefix | default('172.17.0') }}.80
+                  {%- endif %}
+
               spec:
                 type: LoadBalancer
           customServiceConfig: |
@@ -107,7 +122,12 @@ nova_ironic_patch: |
                   annotations:
                     metallb.universe.tf/address-pool: internalapi
                     metallb.universe.tf/allow-shared-ip: internalapi
+                    {% if ipv6_enabled | default(false) -%}
+                    metallb.universe.tf/loadBalancerIPs: {{ internalapi_prefix_ipv6 | default('2620:cf:cf:bbbb') }}::50
+                    {%- else -%}
                     metallb.universe.tf/loadBalancerIPs: {{ internalapi_prefix | default('172.17.0') }}.80
+                    {%- endif %}
+
                 spec:
                   type: LoadBalancer
           customServiceConfig: |
@@ -121,7 +141,12 @@ nova_ironic_patch: |
                 annotations:
                   metallb.universe.tf/address-pool: internalapi
                   metallb.universe.tf/allow-shared-ip: internalapi
+                  {% if ipv6_enabled | default(false) -%}
+                  metallb.universe.tf/loadBalancerIPs: {{ internalapi_prefix_ipv6 | default('2620:cf:cf:bbbb') }}::50
+                  {%- else -%}
                   metallb.universe.tf/loadBalancerIPs: {{ internalapi_prefix | default('172.17.0') }}.80
+                  {%- endif %}
+
               spec:
                 type: LoadBalancer
           customServiceConfig: |
diff --git a/tests/roles/ovn_adoption/defaults/main.yaml b/tests/roles/ovn_adoption/defaults/main.yaml
@@ -6,6 +6,13 @@ storage_class_name: local-storage
 storage_reclaim_policy: delete
 ironic_adoption: false
 
+# Network configuration for IPv4/IPv6 support
+ipv6_enabled: false
+internalapi_src: "172.17.1.0/24"
+internalapi_src_ipv6: "2620:cf:cf:bbbb::/64"
+ctlplane_prefix: "192.168.122"
+ctlplane_prefix_ipv6: "2620:cf:cf:aaaa"
+
 ovs_db_patch: |
   spec:
     ovn:
diff --git a/tests/roles/ovn_adoption/tasks/main.yaml b/tests/roles/ovn_adoption/tasks/main.yaml
@@ -45,11 +45,16 @@
   ansible.builtin.set_fact:
     ovn_copy_shell_vars: |
       STORAGE_CLASS={{ storage_class_name }}
+      {% if ipv6_enabled | bool %}
+      PODIFIED_OVSDB_NB_IP=[{{ podified_ovn_nb_ip_result.stdout }}]
+      PODIFIED_OVSDB_SB_IP=[{{ podified_ovn_sb_ip_result.stdout }}]
+      SOURCE_OVSDB_IP=[{{ source_ovndb_ip }}]
+      {% else %}
       PODIFIED_OVSDB_NB_IP={{ podified_ovn_nb_ip_result.stdout }}
       PODIFIED_OVSDB_SB_IP={{ podified_ovn_sb_ip_result.stdout }}
-      OVSDB_IMAGE={{ ovn_image }}
-
       SOURCE_OVSDB_IP={{ source_ovndb_ip }}
+      {% endif %}
+      OVSDB_IMAGE={{ ovn_image }}
 
       CONTROLLER1_SSH="{{ controller1_ssh }}"
       CONTROLLER2_SSH="{{ controller2_ssh }}"
@@ -153,18 +158,33 @@
 # filter allowing traffic from podified network is needed. Adding the rules
 # no matter the scenario to simplify logic and on a non-scenario-A environment
 # this rule shouldn't harm.
-- name: Add nftables rule to allow podified internalapi trafic to controllers
+- name: Add nftables rule to allow podified internalapi traffic to controllers (IPv4)
+  ansible.builtin.shell: |
+    {{ shell_header }}
+    {{ oc_header }}
+    {{ ovn_copy_shell_vars }}
+
+    $CONTROLLER1_SSH sudo nft add rule inet filter INPUT ip saddr {{ internalapi_src }} tcp dport 6641 ct state new counter accept
+    $CONTROLLER1_SSH sudo nft add rule inet filter INPUT ip saddr {{ internalapi_src }} tcp dport 6642 ct state new counter accept
+    $CONTROLLER2_SSH sudo nft add rule inet filter INPUT ip saddr {{ internalapi_src }} tcp dport 6641 ct state new counter accept
+    $CONTROLLER2_SSH sudo nft add rule inet filter INPUT ip saddr {{ internalapi_src }} tcp dport 6642 ct state new counter accept
+    $CONTROLLER3_SSH sudo nft add rule inet filter INPUT ip saddr {{ internalapi_src }} tcp dport 6641 ct state new counter accept
+    $CONTROLLER3_SSH sudo nft add rule inet filter INPUT ip saddr {{ internalapi_src }} tcp dport 6642 ct state new counter accept
+  when: not ipv6_enabled | bool
+
+- name: Add nftables rule to allow podified internalapi traffic to controllers (IPv6)
   ansible.builtin.shell: |
     {{ shell_header }}
     {{ oc_header }}
     {{ ovn_copy_shell_vars }}
 
-    $CONTROLLER1_SSH sudo nft add rule inet filter INPUT ip saddr 172.17.1.0/24 tcp dport 6641 ct state new counter accept
-    $CONTROLLER1_SSH sudo nft add rule inet filter INPUT ip saddr 172.17.1.0/24 tcp dport 6642 ct state new counter accept
-    $CONTROLLER2_SSH sudo nft add rule inet filter INPUT ip saddr 172.17.1.0/24 tcp dport 6641 ct state new counter accept
-    $CONTROLLER2_SSH sudo nft add rule inet filter INPUT ip saddr 172.17.1.0/24 tcp dport 6642 ct state new counter accept
-    $CONTROLLER3_SSH sudo nft add rule inet filter INPUT ip saddr 172.17.1.0/24 tcp dport 6641 ct state new counter accept
-    $CONTROLLER3_SSH sudo nft add rule inet filter INPUT ip saddr 172.17.1.0/24 tcp dport 6642 ct state new counter accept
+    $CONTROLLER1_SSH sudo nft add rule inet filter INPUT ip6 saddr {{ internalapi_src_ipv6 }} tcp dport 6641 ct state new counter accept
+    $CONTROLLER1_SSH sudo nft add rule inet filter INPUT ip6 saddr {{ internalapi_src_ipv6 }} tcp dport 6642 ct state new counter accept
+    $CONTROLLER2_SSH sudo nft add rule inet filter INPUT ip6 saddr {{ internalapi_src_ipv6 }} tcp dport 6641 ct state new counter accept
+    $CONTROLLER2_SSH sudo nft add rule inet filter INPUT ip6 saddr {{ internalapi_src_ipv6 }} tcp dport 6642 ct state new counter accept
+    $CONTROLLER3_SSH sudo nft add rule inet filter INPUT ip6 saddr {{ internalapi_src_ipv6 }} tcp dport 6641 ct state new counter accept
+    $CONTROLLER3_SSH sudo nft add rule inet filter INPUT ip6 saddr {{ internalapi_src_ipv6 }} tcp dport 6642 ct state new counter accept
+  when: ipv6_enabled | bool
 
 - name: dump OVN databases using tcp connection
   no_log: "{{ use_no_log }}"
diff --git a/tests/roles/ovn_adoption/tasks/ovn_ospdo_src_vars.yaml b/tests/roles/ovn_adoption/tasks/ovn_ospdo_src_vars.yaml
@@ -19,11 +19,16 @@
   ansible.builtin.set_fact:
     ovn_copy_shell_vars: |
       STORAGE_CLASS={{ ospdo_storage_class.stdout }}
+      {% if ipv6_enabled | bool %}
+      PODIFIED_OVSDB_NB_IP=[{{ podified_ovn_nb_ip_result.stdout }}]
+      PODIFIED_OVSDB_SB_IP=[{{ podified_ovn_sb_ip_result.stdout }}]
+      SOURCE_OVSDB_IP=[{{ source_ovndb_ip_str.stdout }}]
+      {% else %}
       PODIFIED_OVSDB_NB_IP={{ podified_ovn_nb_ip_result.stdout }}
       PODIFIED_OVSDB_SB_IP={{ podified_ovn_sb_ip_result.stdout }}
-      OVSDB_IMAGE={{ ovn_image }}
-
       SOURCE_OVSDB_IP={{ source_ovndb_ip_str.stdout }}
+      {% endif %}
+      OVSDB_IMAGE={{ ovn_image }}
 
       CONTROLLER1_SSH="{{ controller1_ssh }}"
       CONTROLLER2_SSH="echo ospdo src env, skipping on controller-1 "
diff --git a/tests/roles/placement_adoption/defaults/main.yaml b/tests/roles/placement_adoption/defaults/main.yaml
@@ -16,6 +16,11 @@ placement_patch: |
                 annotations:
                   metallb.universe.tf/address-pool: internalapi
                   metallb.universe.tf/allow-shared-ip: internalapi
+                  {% if ipv6_enabled | default(false) -%}
+                  metallb.universe.tf/loadBalancerIPs: {{ internalapi_prefix_ipv6 | default('2620:cf:cf:bbbb') }}::50
+                  {%- else -%}
                   metallb.universe.tf/loadBalancerIPs: {{ internalapi_prefix | default('172.17.0') }}.80
+                  {%- endif %}
+
               spec:
                 type: LoadBalancer
diff --git a/tests/roles/pull_openstack_configuration/defaults/main.yaml b/tests/roles/pull_openstack_configuration/defaults/main.yaml
@@ -1,4 +1,4 @@
 os_diff_etc_dir: /etc/os-diff
 os_diff_dir: tmp/os-diff
 os_diff_data_dir: tmp/os-diff
-source_os_diff_config_ip: 192.168.122.100
+source_os_diff_config_ip: "{% if ipv6_enabled | default(false) %}{{ ctlplane_prefix_ipv6 | default('2620:cf:cf:aaaa') }}::76{% else %}{{ ctlplane_prefix | default('192.168.122') }}.100{% endif %}"
diff --git a/tests/roles/swift_adoption/defaults/main.yaml b/tests/roles/swift_adoption/defaults/main.yaml
@@ -27,7 +27,12 @@ swift_patch: |
                   annotations:
                     metallb.universe.tf/address-pool: internalapi
                     metallb.universe.tf/allow-shared-ip: internalapi
+                    {% if ipv6_enabled | default(false) -%}
+                    metallb.universe.tf/loadBalancerIPs: {{ internalapi_prefix_ipv6 | default('2620:cf:cf:bbbb') }}::50
+                    {%- else -%}
                     metallb.universe.tf/loadBalancerIPs: {{ internalapi_prefix | default('172.17.0') }}.80
+                    {%- endif %}
+
                 spec:
                   type: LoadBalancer
           networkAttachments:
diff --git a/tests/roles/telemetry_adoption/defaults/main.yaml b/tests/roles/telemetry_adoption/defaults/main.yaml
