Enable 4.17 du profile for ACM ZTP Scale Testing and place siteconfigs/manifests for acm scale testing in new directory structure

Author: akrzos

ansible/roles/hv-vm-manifests-sno/defaults/main.yml

@@ -23,7 +23,7 @@ siteconfig_baremetalhost_override_converged_flow: false
 siteconfig_exclude_sync_time_once: false
 
 # Enable DU profile SNO installConfigOverrides (Can not be combined with siteconfig_fips)
-# Can be set to "none", "4.12", "4.13", "4.14", "4.15", or "4.16"
+# Can be set to "none", "4.12", "4.13", "4.14", "4.15", "4.16", or "4.17"
 siteconfig_sno_du_profile: "4.16"
 
 # Enable fips via installConfigOverrides (Set siteconfig_sno_du_profile to "none")

ansible/roles/hv-vm-manifests-sno/tasks/main.yml

@@ -2,16 +2,29 @@
 # hv-vm-manifests-sno tasks
 
 - name: Create directories for hv-vm manifests on bastion for SNOs
-  file:
+  ansible.builtin.file:
     path: "{{ item }}"
     state: directory
   delegate_to: "{{ groups['bastion'][0] }}"
   run_once: true
   loop:
   - "{{ hv_vm_manifests_directory }}/"
   - "{{ hv_vm_manifests_directory }}/sno"
-  - "{{ hv_vm_manifests_directory }}/sno/manifests"
-  - "{{ hv_vm_manifests_directory }}/sno/siteconfigs"
+  - "{{ hv_vm_manifests_directory }}/sno/ai-siteconfigs"
+  - "{{ hv_vm_manifests_directory }}/sno/ai-manifests"
+
+- name: Symlink siteconfigs and manifests directories
+  ansible.builtin.file:
+    src: "{{ item.src }}"
+    dest: "{{ item.dest }}"
+    state: link
+  delegate_to: "{{ groups['bastion'][0] }}"
+  run_once: true
+  loop:
+  - src: "{{ hv_vm_manifests_directory }}/sno/ai-siteconfigs"
+    dest: "{{ hv_vm_manifests_directory }}/sno/siteconfigs"
+  - src: "{{ hv_vm_manifests_directory }}/sno/ai-manifests"
+    dest: "{{ hv_vm_manifests_directory }}/sno/manifests"
 
 - name: Obtain pull-secret for bastion registry
   slurp:
@@ -28,21 +41,15 @@
   run_once: true
   when: use_bastion_registry
 
-- name: Create directories per SNO for hv-vm manifests on bastion
-  file:
-    path: "{{ hv_vm_manifests_directory }}/sno/manifests/{{ inventory_hostname }}"
-    state: directory
-  delegate_to: "{{ groups['bastion'][0] }}"
-
 - name: Template a manifest per hv-vm on bastion as an SNO
   template:
     src: "{{ item.src }}"
     dest: "{{ item.dest }}"
   loop:
   - src: manifest.yml.j2
-    dest: "{{ hv_vm_manifests_directory }}/sno/manifests/{{ inventory_hostname }}/manifest.yml"
+    dest: "{{ hv_vm_manifests_directory }}/sno/ai-manifests/{{ inventory_hostname }}-manifests.yml"
   - src: siteconfig.yml.j2
-    dest: "{{ hv_vm_manifests_directory }}/sno/siteconfigs/{{ inventory_hostname }}-siteconfig.yml"
+    dest: "{{ hv_vm_manifests_directory }}/sno/ai-siteconfigs/{{ inventory_hostname }}-siteconfig.yml"
   - src: siteconfig-resources.yml.j2
-    dest: "{{ hv_vm_manifests_directory }}/sno/siteconfigs/{{ inventory_hostname }}-resources.yml"
+    dest: "{{ hv_vm_manifests_directory }}/sno/ai-siteconfigs/{{ inventory_hostname }}-resources.yml"
   delegate_to: "{{ groups['bastion'][0] }}"

ansible/roles/hv-vm-manifests-sno/templates/manifest.yml.j2

@@ -153,6 +153,9 @@ metadata:
   name: {{ inventory_hostname }}
   labels:
     common: 'true'
+{% if siteconfig_sno_du_profile in ["4.12", "4.13", "4.14", "4.15", "4.16", "4.17"] %}
+    du-profile: "{{ siteconfig_sno_du_profile }}"
+{% endif %}
     group-du-sno: ''
     name: {{ inventory_hostname }}
     observability: disabled

ansible/roles/hv-vm-manifests-sno/templates/siteconfig.yml.j2

@@ -33,7 +33,7 @@ spec:
     # installConfigOverrides:  "{\"capabilities\":{\"baselineCapabilitySet\": \"None\", \"additionalEnabledCapabilities\": [ \"marketplace\", \"NodeTuning\" ] }}"
     # 4.15
     # installConfigOverrides:  "{\"capabilities\":{\"baselineCapabilitySet\": \"None\", \"additionalEnabledCapabilities\": [ \"OperatorLifecycleManager\", \"NodeTuning\" ] }}"
-    # 4.16
+    # 4.16, 4.17
     # installConfigOverrides:  "{\"capabilities\":{\"baselineCapabilitySet\": \"None\", \"additionalEnabledCapabilities\": [ \"OperatorLifecycleManager\", \"Ingress\", \"NodeTuning\" ] }}"
 {% elif siteconfig_sno_du_profile in ["4.13", "4.14"] %}
     # 4.12
@@ -42,7 +42,7 @@ spec:
     installConfigOverrides:  "{\"capabilities\":{\"baselineCapabilitySet\": \"None\", \"additionalEnabledCapabilities\": [ \"marketplace\", \"NodeTuning\" ] }}"
     # 4.15
     # installConfigOverrides:  "{\"capabilities\":{\"baselineCapabilitySet\": \"None\", \"additionalEnabledCapabilities\": [ \"OperatorLifecycleManager\", \"NodeTuning\" ] }}"
-    # 4.16
+    # 4.16, 4.17
     # installConfigOverrides:  "{\"capabilities\":{\"baselineCapabilitySet\": \"None\", \"additionalEnabledCapabilities\": [ \"OperatorLifecycleManager\", \"Ingress\", \"NodeTuning\" ] }}"
 {% elif siteconfig_sno_du_profile == "4.15" %}
     # 4.12
@@ -51,16 +51,16 @@ spec:
     # installConfigOverrides:  "{\"capabilities\":{\"baselineCapabilitySet\": \"None\", \"additionalEnabledCapabilities\": [ \"marketplace\", \"NodeTuning\" ] }}"
     # 4.15
     installConfigOverrides:  "{\"capabilities\":{\"baselineCapabilitySet\": \"None\", \"additionalEnabledCapabilities\": [ \"OperatorLifecycleManager\", \"NodeTuning\" ] }}"
-    # 4.16
+    # 4.16, 4.17
     # installConfigOverrides:  "{\"capabilities\":{\"baselineCapabilitySet\": \"None\", \"additionalEnabledCapabilities\": [ \"OperatorLifecycleManager\", \"Ingress\", \"NodeTuning\" ] }}"
-{% elif siteconfig_sno_du_profile == "4.16" %}
+{% elif siteconfig_sno_du_profile in ["4.16", "4.17"] %}
     # 4.12
     # installConfigOverrides:  "{\"capabilities\":{\"baselineCapabilitySet\": \"None\", \"additionalEnabledCapabilities\": [ \"marketplace\" ] }}"
     # 4.13, 4.14
     # installConfigOverrides:  "{\"capabilities\":{\"baselineCapabilitySet\": \"None\", \"additionalEnabledCapabilities\": [ \"marketplace\", \"NodeTuning\" ] }}"
     # 4.15
     # installConfigOverrides:  "{\"capabilities\":{\"baselineCapabilitySet\": \"None\", \"additionalEnabledCapabilities\": [ \"OperatorLifecycleManager\", \"NodeTuning\" ] }}"
-    # 4.16
+    # 4.16, 4.17
     installConfigOverrides:  "{\"capabilities\":{\"baselineCapabilitySet\": \"None\", \"additionalEnabledCapabilities\": [ \"OperatorLifecycleManager\", \"Ingress\", \"NodeTuning\" ] }}"
 {% else %}
 {% if siteconfig_fips %}
@@ -69,7 +69,7 @@ spec:
 {% endif %}
     clusterLabels:
       common: 'true'
-{% if siteconfig_sno_du_profile in ["4.12", "4.13", "4.14", "4.15", "4.16"] %}
+{% if siteconfig_sno_du_profile in ["4.12", "4.13", "4.14", "4.15", "4.16", "4.17"] %}
       du-profile: "{{ siteconfig_sno_du_profile }}"
 {% endif %}
       group-du-sno: ''