different DNS servers per rack

Author: eduolivares

playbooks/bgp/prepare-bgp-spines-leaves.yaml

@@ -239,10 +239,13 @@
         autoconnect: true
         conn_name: "{{ item }}"
         type: ethernet
+        ifname: "{{ router_downlink_ifs[loop_index | int] }}"
         method4: disabled
         method6: link-local
         state: present
       loop: "{{ router_downlink_conns }}"
+      loop_control:
+        index_var: loop_index
 
     # uplink router IPv4 is configured for both IPv4 and IPv6 jobs
     - name: Configure uplink router connections with nmcli when IPv4
@@ -509,6 +512,8 @@
             autoconnect: true
             conn_name: "{{ item }}"
             ip4: "{{ leaf_ds_ip4 }}/30"
+            type: ethernet
+            ifname: "{{ downlink_ifs_rack3[loop_index | int] }}"
             method4: manual
             method6: link-local
             state: present
@@ -526,6 +531,8 @@
             autoconnect: true
             conn_name: "{{ item }}"
             ip4: "{{ leaf_ds_ip4 }}/30"
+            type: ethernet
+            ifname: "{{ leaf_downlink_ifs[loop_index | int] }}"
             method4: manual
             method6: link-local
             state: present
@@ -569,6 +576,8 @@
             conn_name: "{{ item }}"
             ip4: "{{ _leaf_ds_ip4 }}/30"
             ip6: "{{ _leaf_ds_ip6 }}/126"
+            type: ethernet
+            ifname: "{{ leaf_downlink_ifs[loop_index | int] }}"
             method4: manual
             method6: manual
             state: present
@@ -605,8 +614,12 @@
         conn_name: "{{ item }}"
         method4: disabled
         method6: link-local
+        type: ethernet
+        ifname: "{{ uplink_ifs[loop_index | int] }}"
         state: present
       loop: "{{ uplink_conns }}"
+      loop_control:
+        index_var: loop_index
 
     - name: Enable FRR Zebra daemon
       become: true

roles/adoption_osp_deploy/tasks/prepare_overcloud.yml

@@ -195,13 +195,37 @@
         loop_var: overcloud_vm
       when: not bgp
 
+    - name: Obtain IPs whose routes need to be added to the undercloud (bgp)
+      when: bgp
+      delegate_to: "{{ overcloud_vm }}"
+      ansible.builtin.getent:
+        database: ahosts
+        key: "{{ item }}"
+      register: _ips_for_oc_routes_getent
+      loop:
+        - registry.redhat.io
+        - cdn.redhat.com
+        - access.redhat.com
+        - cdn01.quay.io
+
     - name: Generate os-net-config file for overcloud nodes (bgp)
       become: true
       delegate_to: "{{ overcloud_vm }}"
       vars:
         _node_net: "{{ cifmw_networking_env_definition.instances[overcloud_vm] }}"
         _dns_server: "{{ _ctlplane_net.[dns_version|default('dns_v4')] }}"
         _interface_mtu: 1500
+        _ips_for_oc_routes_list: >-
+          {{
+            _ips_for_oc_routes_getent.results |
+            map(attribute='ansible_facts.getent_ahosts') |
+            map('dict2items') |
+            flatten |
+            map(attribute='key') |
+            reject('match', '.*:.*') |
+            list |
+            unique
+          }}
         vms:
           osp-r0-compute-0:
             ctlplane: '192.168.122.100'

roles/adoption_osp_deploy/tasks/prepare_undercloud.yml

@@ -59,6 +59,9 @@
           openstack tripleo container image prepare
           default --output-env-file
           {{ ansible_user_dir }}/containers-prepare-parameters.yaml
+          {% if cifmw_adoption_osp_deploy_scenario.container_prepare_local_push_dest | default(false) | bool %}
+          --local-push-destination
+          {% endif %}
       cifmw.general.ci_script:
         output_dir: "{{ cifmw_basedir }}/artifacts"
         script: "{{ _container_prepare_cmd }}"
@@ -125,21 +128,16 @@
 
     - name: Obtain IPs whose routes need to be added to the undercloud (bgp)
       when: bgp
-      ansible.builtin.shell: |
-        getent ahosts {{ item }} | grep STREAM | awk '{print $1}' | grep -v :
-      register: _ips_for_uc_routes_output
+      ansible.builtin.getent:
+        database: ahosts
+        key: "{{ item }}"
+      register: _ips_for_uc_routes_getent
       loop:
         - registry.redhat.io
         - cdn.redhat.com
         - access.redhat.com
         - cdn01.quay.io
 
-    - name: Create list with the previous IPs
-      when: bgp
-      ansible.builtin.set_fact:
-        ips_for_uc_routes_list: "{{ (ips_for_uc_routes_list | default([]) + item.stdout_lines) | ansible.builtin.unique }}"
-      loop: "{{ _ips_for_uc_routes_output.results }}"
-
     - name: Generate os-net-config file (bgp)
       when: bgp
       become: true
@@ -153,7 +151,17 @@
         _gateway_ip: "{{ _ctlplane_net[gw_version|default('gw_v4')] }}"
         _interface_mtu: "{{ _undercloud_net.networks.ctlplaner0.mtu }}"
         _ctlplane_cidr: "{{ _undercloud_net.networks.ctlplaner0[prefix_length_version|default('prefix_length_v4')] }}"
-        _ips_for_uc_routes_list: "{{ ips_for_uc_routes_list }}"
+        _ips_for_uc_routes_list: >-
+          {{
+            _ips_for_uc_routes_getent.results |
+            map(attribute='ansible_facts.getent_ahosts') |
+            map('dict2items') |
+            flatten |
+            map(attribute='key') |
+            reject('match', '.*:.*') |
+            list |
+            unique
+          }}
       ansible.builtin.template:
         src: "os_net_config_undercloud_bgp.yml.j2"
         dest: /etc/os-net-config/tripleo_config.yaml

roles/adoption_osp_deploy/templates/os_net_config_overcloud_bgp.yml.j2

@@ -5,11 +5,21 @@ network_config:
   mtu: {{ _interface_mtu }}
   use_dhcp: true
   defroute: false
-  routes: []
+  routes:
+{% for _ip in _ips_for_oc_routes_list %}
+  - ip_netmask: {{ _ip }}/32
+    next_hop: 192.168.111.1
+{% endfor %}
 - type: interface
   name: nic2
   mtu: {{ _interface_mtu }}
+{% if 'r0' in overcloud_vm %}
   dns_servers: ['192.168.122.1', '192.168.125.1']
+{% elif 'r1' in overcloud_vm %}
+  dns_servers: ['192.168.123.1', '192.168.125.1']
+{% else %}
+  dns_servers: ['192.168.124.1', '192.168.125.1']
+{% endif %}
   domain: []
   routes:
 {% if 'r0' in overcloud_vm %}

scenarios/reproducers/bgp-l3-xl.yml

@@ -563,7 +563,11 @@ cifmw_libvirt_manager_configuration:
           - "l01-node1"
     r1-compute:
       amount: 0
-      root_part_id: "{{ cifmw_root_partition_id }}"
+      root_part_id: >-
+        {{
+          (cifmw_repo_setup_os_release is defined and cifmw_repo_setup_os_release == 'rhel') |
+          ternary(4, 1)
+        }}
       uefi: "{{ cifmw_use_uefi }}"
       image_url: "{{ cifmw_discovered_image_url }}"
       sha256_image_name: "{{ cifmw_discovered_hash }}"
@@ -584,7 +588,11 @@ cifmw_libvirt_manager_configuration:
           - "l11-node1"
     r2-compute:
       amount: 0
-      root_part_id: "{{ cifmw_root_partition_id }}"
+      root_part_id: >-
+        {{
+          (cifmw_repo_setup_os_release is defined and cifmw_repo_setup_os_release == 'rhel') |
+          ternary(4, 1)
+        }}
       uefi: "{{ cifmw_use_uefi }}"
       image_url: "{{ cifmw_discovered_image_url }}"
       sha256_image_name: "{{ cifmw_discovered_hash }}"