Browse Source

install Slurm from EPEL rather than from source

this fixes #318

I left in the code to build  from source in the event that users want to build a specific version other than what is in EPEL

Signed-off-by: John Lockman <jlockman3@gmail.com>
John Lockman 3 years ago
parent
commit
6b872ebc80

+ 2 - 4
roles/slurm_common/tasks/main.yml

@@ -28,10 +28,8 @@
 
 - name: Install packages for slurm
   package:
-    name: "{{ item }}"
+    name: "{{ common_packages }}"
     state: present
-  with_items:
-    - "{{ common_packages }}"
   tags: install
 
 - name: Create munge key
@@ -194,4 +192,4 @@
     state: restarted
     enabled: yes
   tags: install
-  ignore_errors: yes
+  ignore_errors: yes

+ 3 - 1
roles/slurm_common/vars/main.yml

@@ -14,6 +14,8 @@
 ---
 
 common_packages:
+   - slurm-slurmd 
+   - slurm-pmi
    - munge
    - munge-libs
    - munge-devel
@@ -47,4 +49,4 @@ slurmctld_pid: "/var/run/slurmctld.pid"
 slurmd_pid: "/var/run/slurmd.pid"
 cluster_name : "manager,compute"
 slurmctld_log: "/var/log/slurm/slurmctld.log"
-slurmd_log: "/var/log/slurm/slurmd.log"
+slurmd_log: "/var/log/slurm/slurmd.log"

+ 3 - 7
roles/slurm_manager/tasks/main.yml

@@ -49,18 +49,14 @@
 
 - name: Install packages for slurm
   package:
-    name: "{{ item }}"
+    name: "{{ slurm_packages }}"
     state: present
-  with_items:
-    - "{{ slurm_packages }}"
   tags: install
 
 - name: Install development tools
   package:
-    name: "{{ item }}"
+    name: "{{ dev_tools }}"
     state: present
-  with_items:
-    - "{{ dev_tools }}"
   tags: install
 
 - name: Verify if slurm is installed
@@ -238,4 +234,4 @@
   fetch:
     src: "{{ slurm_confpth }}"
     dest: "{{ buffer_path }}"
-    flat: true
+    flat: true

+ 3 - 1
roles/slurm_manager/vars/main.yml

@@ -26,6 +26,8 @@ slurm_packages:
    - perl-Switch
    - libibumad
    - git
+   - slurm-slurmctld
+   - slurm-slurmdbd
 
 dev_tools:
    - rrdtool-devel
@@ -73,4 +75,4 @@ logfile: "/var/log/slurm/slurmdbd.log"
 pidfile: "/var/run/slurmdbd.pid"
 buffer_path: "/tmp/slurm.conf"
 rpm_path: "/root/rpmbuild/RPMS/x86_64/"
-slurm_mode: "0644"
+slurm_mode: "0644"

+ 2 - 6
roles/slurm_workers/tasks/main.yml

@@ -57,16 +57,12 @@
   package:
     name: "{{ slurm_packages }}"
     state: present
-  with_items:
-    - "{{ slurm_packages }}"
   tags: install
 
 - name: Install development tools
   package:
-    name: "{{ item }}"
+    name: "{{ dev_tools }}"
     state: present
-  with_items:
-    - "{{ dev_tools }}"
   tags: install
 
 - name: Verify if slurm is installed
@@ -148,4 +144,4 @@
     name: slurmd.service
     state: started
     enabled: yes
-  tags: install
+  tags: install