[installer ipi] use IPv6 machineCIDR and VIPs in singlestack ipv6

Author: manurodriguez

roles/installer/templates/install-config-virtualmedia.j2

@@ -9,8 +9,10 @@ proxy:
 metadata:
   name: {{ cluster }}
 networking:
-{% if not dualstack_baremetal|bool %}
+{% if not dualstack_baremetal|bool and not ipv6_enabled|bool %}
   machineCIDR: {{ extcidrnet }}
+{% elif ipv6_enabled|bool %}
+  machineCIDR: {{ extcidrnet6 }}
 {% endif %}
   networkType: {{ network_type }}
 {% if ipv6_enabled|bool and not (ipv4_baremetal|bool or dualstack_baremetal|bool) %}
@@ -48,22 +50,22 @@ platform:
   baremetal:
 {% if ((release_version.split('.')[0]|int == 4) and (release_version.split('.')[1]|int >= 12)) and dualstack_baremetal|bool and dualstack_vips|bool %}
     apiVIPs:
-{% if apivip is defined and apivip|ipv4 %}
+{% if ipv4_baremetal|bool and apivip is defined and apivip|ipv4 %}
       - {{ apivip }}
 {% endif %}
 {% if ipv6_enabled|bool and apivip6 is defined and apivip6|ipv6 %}
       - {{ apivip6 }}
 {% endif %}
     ingressVIPs:
-{% if ingressvip is defined and ingressvip|ipv4 %}
+{% if ipv4_baremetal|bool and ingressvip is defined and ingressvip|ipv4 %}
       - {{ ingressvip }}
 {% endif %}
 {% if ipv6_enabled|bool and ingressvip6 is defined and ingressvip6|ipv6 %}
       - {{ ingressvip6 }}
 {% endif %}
 {% else %}
-    apiVIP: {{ apivip }}
-    ingressVIP: {{ ingressvip }}
+    apiVIP: {{ (ipv4_baremetal|bool) | ternary(apivip, apivip6) }}
+    ingressVIP: {{ (ipv4_baremetal|bool) | ternary(ingressvip, ingressvip6) }}
 {% endif %}
 {% if ((release_version.split('.')[0]|int == 4) and (release_version.split('.')[1]|int < 5)) %}
     dnsVIP: {{ dnsvip }}

roles/installer/templates/install-config.j2

@@ -9,8 +9,10 @@ proxy:
 metadata:
   name: {{ cluster }}
 networking:
-{% if not dualstack_baremetal|bool  %}
+{% if not dualstack_baremetal|bool and not ipv6_enabled|bool %}
   machineCIDR: {{ extcidrnet }}
+{% elif ipv6_enabled|bool %}
+  machineCIDR: {{ extcidrnet6 }}
 {% endif %}
   networkType: {{ network_type }}
 {% if ipv6_enabled|bool and not (ipv4_baremetal|bool or dualstack_baremetal|bool) %}
@@ -48,22 +50,22 @@ platform:
   baremetal:
 {% if ((release_version.split('.')[0]|int == 4) and (release_version.split('.')[1]|int >= 12)) and dualstack_baremetal|bool and dualstack_vips|bool %}
     apiVIPs:
-{% if apivip is defined and apivip|ipv4 %}
+{% if ipv4_baremetal|bool and apivip is defined and apivip|ipv4 %}
       - {{ apivip }}
 {% endif %}
 {% if ipv6_enabled|bool and apivip6 is defined and apivip6|ipv6 %}
       - {{ apivip6 }}
 {% endif %}
     ingressVIPs:
-{% if ingressvip is defined and ingressvip|ipv4 %}
+{% if ipv4_baremetal|bool and ingressvip is defined and ingressvip|ipv4 %}
       - {{ ingressvip }}
 {% endif %}
 {% if ipv6_enabled|bool and ingressvip6 is defined and ingressvip6|ipv6 %}
       - {{ ingressvip6 }}
 {% endif %}
 {% else %}
-    apiVIP: {{ apivip }}
-    ingressVIP: {{ ingressvip }}
+    apiVIP: {{ (ipv4_baremetal|bool) | ternary(apivip, apivip6) }}
+    ingressVIP: {{ (ipv4_baremetal|bool) | ternary(ingressvip, ingressvip6) }}
 {% endif %}
 {% if ((release_version.split('.')[0]|int == 4) and (release_version.split('.')[1]|int < 5)) %}
     dnsVIP: {{ dnsvip }}