Address #747 - ibmcloud does not use controlplane_network (#749)

Author: akrzos

ansible/ibmcloud-setup-bastion.yml

@@ -13,7 +13,6 @@
   - vars/ibmcloud.yml
   vars:
     assisted_installer_host: "{{ hostvars[inventory_hostname]['private_address'] }}"
-    bastion_controlplane_ip: "{{ hostvars[inventory_hostname]['private_address'] }}"
     http_store_host: "{{ hostvars[inventory_hostname]['private_address'] }}"
   roles:
   - validate-vars

ansible/roles/bastion-dnsmasq/templates/jetlag.conf.j2

@@ -1,14 +1,21 @@
 # Jetlag provided DNS on Bastion
 {% if lab in cloud_labs %}
 except-interface={{ bastion_public_interface }}
-{% endif %}
 
 # Bastion / assisted-installer / http-server / registry / router / dns
-{% for network in controlplane_network %}
+address=/{{ groups['bastion'][0] }}/{{ hostvars[inventory_hostname]['private_address'] }}
+
+address=/api.{{ cluster_name }}.{{ base_dns_name }}/{{ controlplane_network_api }}
+address=/apps.{{ cluster_name }}.{{ base_dns_name }}/{{ controlplane_network_ingress }}
+
+{% else %}
+# Bastion / assisted-installer / http-server / registry / router / dns
+{%   for network in controlplane_network %}
 address=/{{ groups['bastion'][0] }}/{{ network | ansible.utils.nthhost(1) }}
 address=/api.{{ cluster_name }}.{{ base_dns_name }}/{{ network | ansible.utils.nthhost(3) }}
 address=/apps.{{ cluster_name }}.{{ base_dns_name }}/{{ network | ansible.utils.nthhost(4) }}
-{% endfor %}
+{%   endfor %}
+{% endif %}
 
 # Jetlag provided DNS for VMs
 {% for vm in groups['hv_vm'] %}

ansible/roles/bastion-dnsmasq/templates/resolv.conf.j2

@@ -1,19 +1,23 @@
 # Deployed by Jetlag automation
 search {{ base_dns_name }}
-{% if public_vlan | default(false) %}
-nameserver {{ ansible_default_ipv4.address }}
+{% if lab in cloud_labs %}
+nameserver {{ hostvars[inventory_hostname]['private_address'] }}
 {% else %}
+{%   if public_vlan | default(false) %}
+nameserver {{ ansible_default_ipv4.address }}
+{%   else %}
 nameserver {{ controlplane_network[0] | ansible.utils.nthhost(1) }}
+{%   endif %}
 {% endif %}
 {% if lab in rh_labs or lab == "byol" %}
-{% for dns in labs[lab]['dns'] %}
+{%   for dns in labs[lab]['dns'] %}
 nameserver {{ dns }}
-{% endfor %}
+{%   endfor %}
 {% else %}
-{% if dns_servers | length == 1 %}
+{%   if dns_servers | length == 1 %}
 nameserver {{ dns_servers[0] }}
-{% elif dns_servers | length >= 2 %}
+{%   elif dns_servers | length >= 2 %}
 nameserver {{ dns_servers[0] }}
 nameserver {{ dns_servers[1] }}
-{% endif %}
+{%   endif %}
 {% endif %}

ansible/roles/create-ai-cluster/tasks/main.yml

@@ -49,11 +49,13 @@
           "openshift_version": "{{ openshift_version }}",
           "high_availability_mode": "None",
           "base_dns_domain": "{{ base_dns_name }}",
+        {% if lab in rh_labs %}
           "machine_networks": [
         {% for network in controlplane_network %}
             {"cidr": "{{ network }}"}{{ "," if not loop.last else "" }}
         {% endfor %}
           ],
+        {% endif %}
           "cluster_networks": [
         {% for i in range(cluster_network_cidr | length) %}
             {"cidr": "{{ cluster_network_cidr[i] }}", "host_prefix": {{ cluster_network_host_prefix[i] }} }{{ "," if not loop.last else "" }}
@@ -117,11 +119,13 @@
           "name": "{{ cluster_name }}",
           "openshift_version": "{{ openshift_version }}",
           "base_dns_domain": "{{ base_dns_name }}",
+        {% if lab in rh_labs %}
           "machine_networks": [
         {% for network in controlplane_network %}
             {"cidr": "{{ network }}"}{{ "," if not loop.last else "" }}
         {% endfor %}
           ],
+        {% endif %}
           "cluster_networks": [
         {% for i in range(cluster_network_cidr | length) %}
             {"cidr": "{{ cluster_network_cidr[i] }}", "host_prefix": {{ cluster_network_host_prefix[i] }} }{{ "," if not loop.last else "" }}

ansible/roles/create-inventory/defaults/main/networks.yml

@@ -18,7 +18,7 @@ controlplane_network_prefix: [16]
 # Gateway for controlplane network - defaults to .1 of first network
 # Can be overridden for special cases (e.g., public VLAN)
 controlplane_network_gateway: "{{ controlplane_network[0] | ansible.utils.nthhost(1) }}"
-# Sets "bastion_controlplane_ip" as primary dns
+# Sets bastion as primary dns
 controlplane_bastion_as_dns: true
 
 # OCP networks - always lists

ansible/roles/create-inventory/templates/inventory-sno.j2

@@ -71,7 +71,7 @@ lab_interface={{ controlplane_lab_interface }}
 # network_prefix={{ controlplane_network_prefix }}
 # gateway={{ controlplane_network_gateway }}
 {% if controlplane_bastion_as_dns %}
-# dns1={{ bastion_controlplane_ip }}
+# dns1={{ controlplane_network[0] | ansible.utils.nthhost(1) }}
 {% else %}
 # dns1={{ labs[lab]['dns'][0] }}
 # dns2={{ labs[lab]['dns'][1] | default('') }}
@@ -142,7 +142,7 @@ bmc_password={{ bmc_password }}
 # network_prefix={{ controlplane_network_prefix }}
 # gateway={{ controlplane_network_gateway }}
 {%   if controlplane_bastion_as_dns %}
-# dns1={{ bastion_controlplane_ip }}
+# dns1={{ controlplane_network[0] | ansible.utils.nthhost(1) }}
 {%   else %}
 # dns1={{ labs[lab]['dns'][0] }}
 # dns2={{ labs[lab]['dns'][1] | default('') }}

ansible/roles/validate-vars/tasks/main.yml

@@ -124,6 +124,8 @@
   when: hostvars | json_query('(*)[?network_mac]')
 
 - name: Validate network configuration
+  when:
+  - lab in rh_labs
   block:
   - name: Validate controlplane_network is a list
     fail: