Allow the default VM nic to be adjusted for all ACM/ZTP manifests and…

… set it to `enp1s0` (#555)
redhat-performance · Sep 25, 2024 · 8573a5e · 8573a5e
1 parent f85a67b
commit 8573a5e
Show file tree

Hide file tree

Showing 11 changed files with 38 additions and 30 deletions.
diff --git a/ansible/roles/hv-vm-manifests-compact/defaults/main.yml b/ansible/roles/hv-vm-manifests-compact/defaults/main.yml
@@ -3,6 +3,8 @@
 
 hv_vm_manifests_directory: /root/hv-vm
 
+vm_nic_interface: enp1s0
+
 # 64 is a prefix for ipv6, 24 would work for ipv4
 compact_cluster_network_host_prefix: 64
 

diff --git a/ansible/roles/hv-vm-manifests-compact/templates/manifest.yml.j2 b/ansible/roles/hv-vm-manifests-compact/templates/manifest.yml.j2
@@ -193,7 +193,7 @@ spec:
 # spec:
 #   config:
 #     interfaces:
-#     - name: enp1s0
+#     - name: {{ vm_nic_interface }}
 #       type: ethernet
 #       state: up
 #       {{ "ipv6" if hostvars[groups['hv_vm'][vm]]['ip'] | ansible.utils.ipv6 else "ipv4" }}:
@@ -211,10 +211,10 @@ spec:
 #       - destination: {{ "::/0" if hostvars[groups['hv_vm'][vm]]['ip'] | ansible.utils.ipv6 else "0.0.0.0/0" }}
 #         metric: 1
 #         next-hop-address: {{ hostvars[groups['hv_vm'][vm]]['gateway'] }}
-#         next-hop-interface: enp1s0
+#         next-hop-interface: {{ vm_nic_interface }}
 #         table-id: 254
 #   interfaces:
-#   - name: "enp1s0"
+#   - name: {{ vm_nic_interface }}
 #     macAddress: {{ hostvars[groups['hv_vm'][vm]]['mac_address'] }}
 {% else %}
 ---
@@ -228,7 +228,7 @@ metadata:
 spec:
   config:
     interfaces:
-    - name: enp1s0
+    - name: {{ vm_nic_interface }}
       type: ethernet
       state: up
       {{ "ipv6" if hostvars[groups['hv_vm'][vm]]['ip'] | ansible.utils.ipv6 else "ipv4" }}:
@@ -248,10 +248,10 @@ spec:
       - destination: {{ "::/0" if hostvars[groups['hv_vm'][vm]]['ip'] | ansible.utils.ipv6 else "0.0.0.0/0" }}
         metric: 1
         next-hop-address: {{ hostvars[groups['hv_vm'][vm]]['gateway'] }}
-        next-hop-interface: enp1s0
+        next-hop-interface: {{ vm_nic_interface }}
         table-id: 254
   interfaces:
-  - name: "enp1s0"
+  - name: {{ vm_nic_interface }}
     macAddress: {{ hostvars[groups['hv_vm'][vm]]['mac_address'] }}
 {% endif %}
 {% endfor %}
diff --git a/ansible/roles/hv-vm-manifests-compact/templates/siteconfig.yml.j2 b/ansible/roles/hv-vm-manifests-compact/templates/siteconfig.yml.j2
@@ -99,11 +99,11 @@ spec:
 {% endif %}
       nodeNetwork:
         interfaces:
-        - name: eno1
+        - name: {{ vm_nic_interface }}
           macAddress: {{ hostvars[groups['hv_vm'][vm]]['mac_address'] }}
         config:
           interfaces:
-          - name: eno1
+          - name: {{ vm_nic_interface }}
             type: ethernet
             state: up
 {% if hostvars[groups['hv_vm'][vm]]['hv_ip'] | ansible.utils.ipv4 %}
@@ -134,7 +134,7 @@ spec:
           routes:
             config:
             - destination: {{ "::/0" if hostvars[groups['hv_vm'][vm]]['hv_ip'] | ansible.utils.ipv6 else "0.0.0.0/0" }}
-              next-hop-interface: eno1
+              next-hop-interface: {{ vm_nic_interface }}
               next-hop-address: {{ hostvars[groups['hv_vm'][vm]]['gateway'] }}
               table-id: 254
 {% endfor %}
diff --git a/ansible/roles/hv-vm-manifests-jumbo/defaults/main.yml b/ansible/roles/hv-vm-manifests-jumbo/defaults/main.yml
@@ -10,3 +10,5 @@ registry_path: /opt/registry
 # Used with bmc-secret
 bmc_username_base64: "{{ 'redhat' | b64encode }}"
 bmc_password_base64: "{{ 'password' | b64encode }}"
+
+vm_nic_interface: enp1s0
diff --git a/ansible/roles/hv-vm-manifests-jumbo/templates/manifest.yml.j2 b/ansible/roles/hv-vm-manifests-jumbo/templates/manifest.yml.j2
@@ -192,7 +192,7 @@ spec:
 # spec:
 #   config:
 #     interfaces:
-#     - name: enp1s0
+#     - name: {{ vm_nic_interface }}
 #       type: ethernet
 #       state: up
 #       {{ "ipv6" if hostvars[vm]['ip'] | ansible.utils.ipv6 else "ipv4" }}:
@@ -210,10 +210,10 @@ spec:
 #       - destination: {{ "::/0" if hostvars[vm]['ip'] | ansible.utils.ipv6 else "0.0.0.0/0" }}
 #         metric: 1
 #         next-hop-address: {{ hostvars[vm]['gateway'] }}
-#         next-hop-interface: enp1s0
+#         next-hop-interface: {{ vm_nic_interface }}
 #         table-id: 254
 #   interfaces:
-#   - name: "enp1s0"
+#   - name: {{ vm_nic_interface }}
 #     macAddress: {{ hostvars[vm]['mac_address'] }}
 {% else %}
 ---
@@ -227,7 +227,7 @@ metadata:
 spec:
   config:
     interfaces:
-    - name: enp1s0
+    - name: {{ vm_nic_interface }}
       type: ethernet
       state: up
       {{ "ipv6" if hostvars[vm]['ip'] | ansible.utils.ipv6 else "ipv4" }}:
@@ -245,10 +245,10 @@ spec:
       - destination: {{ "::/0" if hostvars[vm]['ip'] | ansible.utils.ipv6 else "0.0.0.0/0" }}
         metric: 1
         next-hop-address: {{ hostvars[vm]['gateway'] }}
-        next-hop-interface: enp1s0
+        next-hop-interface: {{ vm_nic_interface }}
         table-id: 254
   interfaces:
-  - name: "enp1s0"
+  - name: {{ vm_nic_interface }}
     macAddress: {{ hostvars[vm]['mac_address'] }}
 {% endif %}
 {% endfor %}
diff --git a/ansible/roles/hv-vm-manifests-sno/defaults/main.yml b/ansible/roles/hv-vm-manifests-sno/defaults/main.yml
@@ -12,6 +12,8 @@ registry_path: /opt/registry
 bmc_username_base64: "{{ 'redhat' | b64encode }}"
 bmc_password_base64: "{{ 'password' | b64encode }}"
 
+vm_nic_interface: enp1s0
+
 # Used in conjunction with including the PerformanceProfile in the DU profile
 siteconfig_enable_cpuset: false
 siteconfig_cpuset: "0-3"

diff --git a/ansible/roles/hv-vm-manifests-sno/templates/ai-manifest.yml.j2 b/ansible/roles/hv-vm-manifests-sno/templates/ai-manifest.yml.j2
@@ -26,7 +26,7 @@ metadata:
 spec:
   config:
     interfaces:
-    - name: enp1s0
+    - name: {{ vm_nic_interface }}
       type: ethernet
       state: up
       {{ "ipv6" if hostvars[inventory_hostname]['ip'] | ansible.utils.ipv6 else "ipv4" }}:
@@ -46,10 +46,10 @@ spec:
       - destination: {{ "::/0" if hostvars[inventory_hostname]['ip'] | ansible.utils.ipv6 else "0.0.0.0/0" }}
         metric: 1
         next-hop-address: {{ hostvars[inventory_hostname]['gateway'] }}
-        next-hop-interface: enp1s0
+        next-hop-interface: {{ vm_nic_interface }}
         table-id: 254
   interfaces:
-  - name: "enp1s0"
+  - name: {{ vm_nic_interface }}
     macAddress: {{ hostvars[inventory_hostname]['mac_address'] }}
 ---
 apiVersion: v1

diff --git a/ansible/roles/hv-vm-manifests-sno/templates/ai-siteconfig.yml.j2 b/ansible/roles/hv-vm-manifests-sno/templates/ai-siteconfig.yml.j2
@@ -134,11 +134,11 @@ spec:
 {% endif %}
       nodeNetwork:
         interfaces:
-        - name: eno1
+        - name: {{ vm_nic_interface }}
           macAddress: {{ hostvars[inventory_hostname]['mac_address'] }}
         config:
           interfaces:
-          - name: eno1
+          - name: {{ vm_nic_interface }}
             type: ethernet
             state: up
 {% if hostvars[inventory_hostname]['ip'] | ansible.utils.ipv4 %}
@@ -169,6 +169,6 @@ spec:
           routes:
             config:
             - destination: {{ "::/0" if hostvars[inventory_hostname]['ip'] | ansible.utils.ipv6 else "0.0.0.0/0" }}
-              next-hop-interface: eno1
+              next-hop-interface: {{ vm_nic_interface }}
               next-hop-address: {{ hostvars[inventory_hostname]['gateway'] }}
               table-id: 254
diff --git a/ansible/roles/hv-vm-manifests-standard/defaults/main.yml b/ansible/roles/hv-vm-manifests-standard/defaults/main.yml
@@ -12,6 +12,8 @@ registry_path: /opt/registry
 bmc_username_base64: "{{ 'redhat' | b64encode }}"
 bmc_password_base64: "{{ 'password' | b64encode }}"
 
+vm_nic_interface: enp1s0
+
 # Used in conjunction with including the PerformanceProfile in the DU profile
 siteconfig_enable_cpuset: false
 siteconfig_cpuset: "0-3"

diff --git a/ansible/roles/hv-vm-manifests-standard/templates/manifest.yml.j2 b/ansible/roles/hv-vm-manifests-standard/templates/manifest.yml.j2
@@ -204,7 +204,7 @@ spec:
 # spec:
 #   config:
 #     interfaces:
-#     - name: enp1s0
+#     - name: {{ vm_nic_interface }}
 #       type: ethernet
 #       state: up
 #       {{ "ipv6" if hostvars[groups['hv_vm'][vm]]['ip'] | ansible.utils.ipv6 else "ipv4" }}:
@@ -224,10 +224,10 @@ spec:
 #       - destination: {{ "::/0" if hostvars[groups['hv_vm'][vm]]['ip'] | ansible.utils.ipv6 else "0.0.0.0/0" }}
 #         metric: 1
 #         next-hop-address: {{ hostvars[groups['hv_vm'][vm]]['gateway'] }}
-#         next-hop-interface: enp1s0
+#         next-hop-interface: {{ vm_nic_interface }}
 #         table-id: 254
 #   interfaces:
-#   - name: "enp1s0"
+#   - name: {{ vm_nic_interface }}
 #     macAddress: {{ hostvars[groups['hv_vm'][vm]]['mac_address'] }}
 {% else %}
 ---
@@ -241,7 +241,7 @@ metadata:
 spec:
   config:
     interfaces:
-    - name: enp1s0
+    - name: {{ vm_nic_interface }}
       type: ethernet
       state: up
       {{ "ipv6" if hostvars[groups['hv_vm'][vm]]['ip'] | ansible.utils.ipv6 else "ipv4" }}:
@@ -261,10 +261,10 @@ spec:
       - destination: {{ "::/0" if hostvars[groups['hv_vm'][vm]]['ip'] | ansible.utils.ipv6 else "0.0.0.0/0" }}
         metric: 1
         next-hop-address: {{ hostvars[groups['hv_vm'][vm]]['gateway'] }}
-        next-hop-interface: enp1s0
+        next-hop-interface: {{ vm_nic_interface }}
         table-id: 254
   interfaces:
-  - name: "enp1s0"
+  - name: {{ vm_nic_interface }}
     macAddress: {{ hostvars[groups['hv_vm'][vm]]['mac_address'] }}
 {% endif %}
 {% endfor %}
diff --git a/ansible/roles/hv-vm-manifests-standard/templates/siteconfig.yml.j2 b/ansible/roles/hv-vm-manifests-standard/templates/siteconfig.yml.j2
@@ -104,11 +104,11 @@ spec:
 {% endif %}
       nodeNetwork:
         interfaces:
-        - name: eno1
+        - name: {{ vm_nic_interface }}
           macAddress: {{ hostvars[groups['hv_vm'][vm]]['mac_address'] }}
         config:
           interfaces:
-          - name: eno1
+          - name: {{ vm_nic_interface }}
             type: ethernet
             state: up
 {% if hostvars[groups['hv_vm'][vm]]['hv_ip'] | ansible.utils.ipv4 %}
@@ -139,7 +139,7 @@ spec:
           routes:
             config:
             - destination: {{ "::/0" if hostvars[groups['hv_vm'][vm]]['hv_ip'] | ansible.utils.ipv6 else "0.0.0.0/0" }}
-              next-hop-interface: eno1
+              next-hop-interface: {{ vm_nic_interface }}
               next-hop-address: {{ hostvars[groups['hv_vm'][vm]]['gateway'] }}
               table-id: 254
 {% endfor %}