move things around

Author: sjpb

ansible/after.yml

@@ -0,0 +1,17 @@
+- hosts: dnf_repos
+  become: yes
+  tasks:
+    - name: Disable pulp repos
+      ansible.builtin.include_role:
+        name: dnf_repos
+        tasks_from: disable_repos.yml
+
+- name: Setup NFS export for compute_init
+  hosts: compute_init:!builder
+  # NB: done last so other roles can prepare configuration etc
+  tags: compute_init
+  become: yes
+  tasks:
+    - include_role:
+        name: compute_init
+        tasks_from: export.yml

ansible/disable-repos.yml

@@ -74,21 +74,3 @@
   - name: Install additional packages
     dnf:
       name: "{{ appliances_extra_packages }}"
-
-- hosts: nhc
-  become: yes
-  tags: nhc
-  tasks:
-    - name: Configure node health checks
-      import_role:
-        name: nhc
-
-- name: Setup NFS export for compute_init
-  hosts: compute_init:!builder
-  # NB: done last so other orles can prepare configuration etc
-  tags: compute_init
-  become: yes
-  tasks:
-    - include_role:
-        name: compute_init
-        tasks_from: export.yml

ansible/extras.yml

@@ -101,18 +101,7 @@
   become: yes
   gather_facts: yes
   tasks:
-    # - import_playbook: slurm.yml:
-    - name: Setup DB
-      include_role:
-        name: mysql
-        tasks_from: install.yml
-      when: "'mysql' in group_names"
-
-    - name: OpenHPC
-      import_role:
-        name: stackhpc.openhpc
-        tasks_from: install.yml
-      when: "'openhpc' in group_names"
+    - import_playbook: slurm.yml
 
     # - import_playbook: portal.yml
     - name: Open Ondemand server (packages)
@@ -257,7 +246,7 @@
   import_playbook: "{{ hook_path if hook_path | exists else 'noop.yml' }}"
   when: hook_path | exists
 
-- import_playbook: disable-repos.yml
+- import_playbook: after.yml
 
 - hosts: builder
   become: yes

ansible/fatimage.yml

@@ -27,7 +27,7 @@
 - import_playbook: slurm.yml
 - import_playbook: portal.yml
 - import_playbook: monitoring.yml
-- import_playbook: disable-repos.yml
+- import_playbook: after.yml
 
 - name: Run post.yml hook
   vars:
@@ -37,12 +37,4 @@
   import_playbook: "{{ hook_path if hook_path | exists else 'noop.yml' }}"
   when: hook_path | exists
 
-- name: Clean up and shutdown Packer VM
-  hosts: builder
-  gather_facts: no
-  become: yes
-  tasks:
-    - import_tasks: cleanup.yml
-    - community.general.shutdown:
-
 ...

ansible/site.yml

@@ -3,11 +3,11 @@
 - name: Setup DB
   hosts: mysql
   become: true
-  tags:
-    - mysql
+  tags: mysql
   tasks:
     - include_role:
         name:  mysql
+        tasks_from: "{{ 'install.yml' if appliances_mode == 'build' else 'main.yml' }}"
 
 - name: Setup slurm-driven rebuild
   hosts: rebuild:!builder
@@ -20,12 +20,9 @@
         name: rebuild
 
 - name: Set locked memory limits on user-facing nodes
-  hosts:
-    - compute
-    - login
+  hosts: compute:login:!builder
   become: yes
-  tags:
-    - openhpc
+  tags: openhpc
   tasks:
     - name: set memory limits
       lineinfile:
@@ -34,7 +31,7 @@
         line: "* soft memlock unlimited"
 
 - name: Block ssh to compute nodes for non-privileged users without running jobs
-  hosts: compute
+  hosts: compute:!builder
   become: yes
   tags:
     - openhpc
@@ -57,19 +54,21 @@
 - name: Setup slurm
   hosts: openhpc
   become: yes
-  tags:
-    - openhpc
+  tags: openhpc
   tasks:
     - include_role:
         name: stackhpc.openhpc
-        tasks_from: "{{ 'runtime.yml' if appliances_mode == 'configure' else 'main.yml' }}"
+        tasks_from: "{{ _openhpc_task_file[appliances_mode] | default('main.yml') }}"
+      vars:
+        _openhpc_task_file:
+          build: install.yml
+          configure: runtime.yml
 
 - name: Setup Node Health Checks
   # Has to be done here as it requires openhpc repos etc for installation
-  hosts: nhc
+  hosts: nhc:!builder
   become: yes
-  tags:
-    - nhc
+  tags: nhc
   tasks:
     - include_role:
         name: nhc

ansible/slurm.yml

@@ -39,7 +39,7 @@ openhpc_state_save_location: "{{ appliances_state_dir + '/slurmctld' if applianc
 openhpc_config_extra: {}
 
 # default additional slurm.conf parameters for the appliance:
-openhpc_config_appliance_default:
+openhpc_config_default:
   SlurmctldParameters:
     - enable_configless
   TaskPlugin: task/cgroup,task/affinity