fix rebuild to do installs during fatimage

Author: sjpb

ansible/fatimage.yml

@@ -108,7 +108,12 @@
         tasks_from: install.yml
       when: "'mysql' in group_names"
 
-    - name: OpenHPC
+    - name: Install rebuild
+      include_role:
+        name: rebuild
+        tasks_from: install.yml
+
+    - name: Install OpenHPC
       import_role:
         name: stackhpc.openhpc
         tasks_from: install.yml

ansible/roles/rebuild/tasks/configure.yml

@@ -0,0 +1,17 @@
+---
+
+- name: Create /etc/openstack
+  file:
+    path: /etc/openstack
+    state: directory
+    owner: slurm
+    group: root
+    mode: u=rX,g=rwX
+
+- name: Copy out clouds.yaml
+  copy:
+    src: "{{ rebuild_clouds_path }}"
+    dest: /etc/openstack/clouds.yaml
+    owner: slurm
+    group: root
+    mode: u=r,g=rw

ansible/roles/rebuild/tasks/install.yml

@@ -0,0 +1,3 @@
+- name: Setup slurm tools
+  include_role:
+    name: slurm_tools

ansible/roles/rebuild/tasks/main.yml

@@ -1,21 +1,4 @@
 ---
 
-- name: Create /etc/openstack
-  file:
-    path: /etc/openstack
-    state: directory
-    owner: slurm
-    group: root
-    mode: u=rX,g=rwX
-
-- name: Copy out clouds.yaml
-  copy:
-    src: "{{ rebuild_clouds_path }}"
-    dest: /etc/openstack/clouds.yaml
-    owner: slurm
-    group: root
-    mode: u=r,g=rw
-
-- name: Setup slurm tools
-  include_role:
-    name: slurm_tools
+- include_tasks: install.yml
+- include_tasks: configure.yml

ansible/slurm.yml

@@ -17,8 +17,9 @@
     - rebuild
     - openhpc
   tasks:
-    - import_role:
+    - include_role:
         name: rebuild
+        tasks_from: "{{ 'configure.yml' if appliances_mode == 'configure' else 'main.yml' }}"
 
 - name: Set locked memory limits on user-facing nodes
   hosts: