merged slurm_dockerimage back into slurm role

2021-06-22 00:26:00 +02:00
parent f83801cb62
commit 78850d4636
9 changed files with 40 additions and 105 deletions
--- a/roles/slurm/tasks/main.yml
+++ b/roles/slurm/tasks/main.yml
@@ -3,9 +3,9 @@
    name: [ slurm, slurm-doc ]
    state: present

- include_role:
-    name: slurm_dockerimage
-  loop: # FIXME: default(omit)!
+- include_tasks:
+    file: dockerimage.yml
+  loop:
  - name: slurmctld
    dockerfile: "{{ lookup('file', 'slurmctld.Dockerfile') }}"
    files:
@@ -16,6 +16,10 @@
    files:
    - dest: start-scripts/30-slurmd
      content: "{{ lookup('file', 'start-scripts/30-slurmd') }}"
+  vars:
+    image_name: "{{image.name | default(omit) }}"
+    dockerfile: "{{image.dockerfile | default(omit) }}"
+    files: "{{image.files | default(omit) }}"
  loop_control:
    loop_var: image
    label: "{{ image.name }}"