Merge pull request #39 from stackhpc/ohpc-2

OpenHPC 2

Author: oneswig

README.md

@@ -133,3 +133,13 @@ To drain nodes, for example, before scaling down the cluster to 6 nodes:
             resume: "{{ inventory_hostname in desired_state }}"
     ...
 
+
+CentOS 8 and OpenHPC 2
+----------------------
+
+To deploy OpenHPC 2 on CentOS 8, you must first enable the CentOS PowerTools repo
+(this ships as standard, but disabled).  To enable PowerTools:
+
+```
+sudo dnf config-manager --set-enabled PowerTools
+```

tasks/compute.yml

@@ -1,12 +1,7 @@
 ---
 - name: Install OpenHPC compute image packages
-  yum:
-    name: "@ohpc-base-compute"
-    state: present
-
-- name: Install OpenHPC SLURM client packages
-  yum:
-    name: "@ohpc-slurm-client"
+  package:
+    name: "{{ ohpc_slurm_compute_packages }}"
     state: present
 
 - name: Select the SLURM service to control

tasks/control.yml

@@ -1,10 +1,7 @@
 ---
 - name: Install OpenHPC master SLURM packages
-  yum:
-    name:
-      - "@ohpc-slurm-server"
-      - "slurm-slurmctld-ohpc"
-      - "slurm-example-configs-ohpc"
+  package:
+    name: "{{ ohpc_slurm_control_packages }}"
     state: present
 
 - name: Select the SLURM service to control

tasks/main.yml

@@ -1,4 +1,18 @@
 ---
+
+# Validate package facts and include version-specific config
+- name: Gather package facts
+  package_facts:
+    manager: rpm
+- assert:
+    that: "'ohpc-release' in ansible_facts.packages"
+    quiet: yes
+    fail_msg: |
+      "The OpenHPC distro package should be installed in the image.
+       Please see http://openhpc.community/downloads/"
+- include_vars:
+    file: "ohpc-{{ ansible_facts.packages['ohpc-release'][0]['version'] }}"
+
 - include: control.yml
   when: openhpc_enable.control | default(false) | bool
 

tasks/runtime.yml

@@ -8,12 +8,8 @@
     openhpc_slurm_partitions | length == 0
 
 - name: Install OpenHPC runtime Slurm packages
-  yum:
-    name:
-      - "slurm-ohpc"
-      - "munge-ohpc"
-      - "slurm-slurmd-ohpc"
-      - "slurm-example-configs-ohpc"
+  package:
+    name: "{{ ohpc_slurm_runtime_packages }}"
     state: present
 
 - name: Ensure the Slurm spool directory exists
@@ -73,12 +69,12 @@
 
 # Install OpenHPC runtime
 - name: Ensure selected OpenHPC packages are installed
-  yum:
+  package:
     name: "{{ openhpc_packages }}"
     state: present
 
 - name: Install OpenHPC LMOD
-  yum:
+  package:
     name: "lmod-ohpc"
     state: present
 

templates/slurm.conf.j2

@@ -62,7 +62,7 @@ SchedulerType=sched/backfill
 #SchedulerRootFilter=
 SelectType=select/cons_res
 SelectTypeParameters=CR_Core
-FastSchedule=0
+#FastSchedule=0
 PriorityType=priority/multifactor
 #PriorityDecayHalfLife=14-0
 #PriorityUsageResetPeriod=14-0

vars/ohpc-1.3

@@ -0,0 +1,19 @@
+---
+# OpenHPC 1.3 on CentOS 7
+
+ohpc_slurm_control_packages:
+  - "@ohpc-slurm-server"
+  - "slurm-slurmctld-ohpc"
+  - "slurm-example-configs-ohpc"
+
+ohpc_slurm_compute_packages:
+  - "@ohpc-base-compute"
+  - "@ohpc-slurm-client"
+
+ohpc_slurm_runtime_packages:
+  - "slurm-ohpc"
+  - "munge-ohpc"
+  - "slurm-slurmd-ohpc"
+  - "slurm-example-configs-ohpc"
+
+...

vars/ohpc-2

@@ -0,0 +1,19 @@
+---
+# OpenHPC 2 on CentOS 8
+
+ohpc_slurm_control_packages:
+  - "ohpc-slurm-server"
+  - "slurm-slurmctld-ohpc"
+  - "slurm-example-configs-ohpc"
+
+ohpc_slurm_compute_packages:
+  - "ohpc-base-compute"
+  - "ohpc-slurm-client"
+
+ohpc_slurm_runtime_packages:
+  - "slurm-ohpc"
+  - "munge"
+  - "slurm-slurmd-ohpc"
+  - "slurm-example-configs-ohpc"
+
+...