Adjustments to match expected acm-deploy-load.py changes in manifest naming/location (#551)

Author: akrzos

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

@@ -8,8 +8,8 @@
   loop:
   - "{{ hv_vm_manifests_directory }}/"
   - "{{ hv_vm_manifests_directory }}/compact"
-  - "{{ hv_vm_manifests_directory }}/compact/manifests"
-  - "{{ hv_vm_manifests_directory }}/compact/siteconfigs"
+  - "{{ hv_vm_manifests_directory }}/compact/ai-siteconfig"
+  - "{{ hv_vm_manifests_directory }}/compact/ai-manifest"
 
 - name: Obtain pull-secret for bastion registry
   slurp:
@@ -22,27 +22,21 @@
     pull_secret: "{{ slurped_pull_secret.content }}"
   when: use_bastion_registry
 
-- name: Fast create directory for each cluster
-  shell: |
-    {% for item in (range(1, compact_cluster_count + 1, 1) | list) %}
-    mkdir -p {{ hv_vm_manifests_directory }}/compact/manifests/compact-{{ '%05d' | format(item) }}
-    {% endfor %}
-
 # Commented out because not currently tested
 # - name: Template a manifest per cluster
 #   template:
 #     src: manifest.yml.j2
-#     dest: "{{ hv_vm_manifests_directory }}/compact/manifests/compact-{{ '%05d' | format(item) }}/manifest.yml"
+#     dest: "{{ hv_vm_manifests_directory }}/compact/ai-manifest/compact-{{ '%05d' | format(item) }}-manifest.yml"
 #   loop: "{{ range(1, compact_cluster_count + 1, 1) | list }}"
 
 - name: Template a siteconfig per cluster
   template:
     src: siteconfig.yml.j2
-    dest: "{{ hv_vm_manifests_directory }}/compact/siteconfigs/compact-{{ '%05d' | format(item) }}-siteconfig.yml"
+    dest: "{{ hv_vm_manifests_directory }}/compact/ai-siteconfig/compact-{{ '%05d' | format(item) }}-siteconfig.yml"
   loop: "{{ range(1, compact_cluster_count + 1, 1) | list }}"
 
 - name: Template a siteconfig-resources per cluster
   template:
     src: siteconfig-resources.yml.j2
-    dest: "{{ hv_vm_manifests_directory }}/compact/siteconfigs/compact-{{ '%05d' | format(item) }}-resources.yml"
+    dest: "{{ hv_vm_manifests_directory }}/compact/ai-siteconfig/compact-{{ '%05d' | format(item) }}-resources.yml"
   loop: "{{ range(1, compact_cluster_count + 1, 1) | list }}"

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

@@ -10,21 +10,8 @@
   loop:
   - "{{ hv_vm_manifests_directory }}/"
   - "{{ hv_vm_manifests_directory }}/sno"
-  - "{{ 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"
+  - "{{ hv_vm_manifests_directory }}/sno/ai-siteconfig"
+  - "{{ hv_vm_manifests_directory }}/sno/ai-manifest"
 
 - name: Obtain pull-secret for bastion registry
   slurp:
@@ -46,10 +33,10 @@
     src: "{{ item.src }}"
     dest: "{{ item.dest }}"
   loop:
-  - src: manifest.yml.j2
-    dest: "{{ hv_vm_manifests_directory }}/sno/ai-manifests/{{ inventory_hostname }}-manifests.yml"
-  - src: siteconfig.yml.j2
-    dest: "{{ hv_vm_manifests_directory }}/sno/ai-siteconfigs/{{ inventory_hostname }}-siteconfig.yml"
-  - src: siteconfig-resources.yml.j2
-    dest: "{{ hv_vm_manifests_directory }}/sno/ai-siteconfigs/{{ inventory_hostname }}-resources.yml"
+  - src: ai-manifest.yml.j2
+    dest: "{{ hv_vm_manifests_directory }}/sno/ai-manifest/{{ inventory_hostname }}-manifest.yml"
+  - src: ai-siteconfig.yml.j2
+    dest: "{{ hv_vm_manifests_directory }}/sno/ai-siteconfig/{{ inventory_hostname }}-siteconfig.yml"
+  - src: ai-resources.yml.j2
+    dest: "{{ hv_vm_manifests_directory }}/sno/ai-siteconfig/{{ inventory_hostname }}-resources.yml"
   delegate_to: "{{ groups['bastion'][0] }}"

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

@@ -8,8 +8,8 @@
   loop:
   - "{{ hv_vm_manifests_directory }}/"
   - "{{ hv_vm_manifests_directory }}/standard"
-  - "{{ hv_vm_manifests_directory }}/standard/manifests"
-  - "{{ hv_vm_manifests_directory }}/standard/siteconfigs"
+  - "{{ hv_vm_manifests_directory }}/standard/ai-siteconfig"
+  - "{{ hv_vm_manifests_directory }}/standard/ai-manifest"
 
 - name: Obtain pull-secret for bastion registry
   slurp:
@@ -22,32 +22,26 @@
     pull_secret: "{{ slurped_pull_secret.content }}"
   when: use_bastion_registry
 
-- name: Fast create directory for each cluster
-  shell: |
-    {% for item in (range(1, standard_cluster_count + 1, 1) | list) %}
-    mkdir -p {{ hv_vm_manifests_directory }}/standard/manifests/standard-{{ '%05d' | format(item) }}
-    {% endfor %}
-
 - name: Template complete manifests per cluster
   template:
     src: manifest.yml.j2
-    dest: "{{ hv_vm_manifests_directory }}/standard/manifests/standard-{{ '%05d' | format(item) }}/manifest.yml"
+    dest: "{{ hv_vm_manifests_directory }}/standard/ai-manifest/standard-{{ '%05d' | format(item) }}-manifest.yml"
   loop: "{{ range(1, standard_cluster_count + 1, 1) | list }}"
 
 - name: Template acm managedcluster manifests per cluster
   template:
     src: managedcluster.yml.j2
-    dest: "{{ hv_vm_manifests_directory }}/standard/manifests/standard-{{ '%05d' | format(item) }}/managedcluster.yml"
+    dest: "{{ hv_vm_manifests_directory }}/standard/ai-manifest/standard-{{ '%05d' | format(item) }}-managedcluster.yml"
   loop: "{{ range(1, standard_cluster_count + 1, 1) | list }}"
 
 - name: Template a siteconfig per cluster
   template:
     src: siteconfig.yml.j2
-    dest: "{{ hv_vm_manifests_directory }}/standard/siteconfigs/standard-{{ '%05d' | format(item) }}-siteconfig.yml"
+    dest: "{{ hv_vm_manifests_directory }}/standard/ai-siteconfig/standard-{{ '%05d' | format(item) }}-siteconfig.yml"
   loop: "{{ range(1, standard_cluster_count + 1, 1) | list }}"
 
 - name: Template a siteconfig-resources per cluster
   template:
     src: siteconfig-resources.yml.j2
-    dest: "{{ hv_vm_manifests_directory }}/standard/siteconfigs/standard-{{ '%05d' | format(item) }}-resources.yml"
+    dest: "{{ hv_vm_manifests_directory }}/standard/ai-siteconfig/standard-{{ '%05d' | format(item) }}-resources.yml"
   loop: "{{ range(1, standard_cluster_count + 1, 1) | list }}"