Merge branch '2.10.2' into 2.10.1_ds_updates

Author: shethdhvani

playbooks/roles/slurm/tasks/common_pmix.yml

@@ -7,7 +7,6 @@
       - libev-devel 
       - libevent-devel 
       - hwloc 
-      - hwloc-devel
   include_role: 
     name: safe_yum
   when: ansible_os_family == 'RedHat'

playbooks/roles/slurm/vars/centos_vars.yml

@@ -51,4 +51,13 @@ slurm_backup_server_packages:
 slurm_login_packages:
   - "{{ download_path }}/slurm_rpms/slurm-centos-pam_slurm-{{slurm_version}}.el7.x86_64.rpm"
   - "{{ download_path }}/slurm_rpms/slurm-centos-libpmi-{{slurm_version}}.el7.x86_64.rpm"
-  - "{{ download_path }}/slurm_rpms/slurm-centos-slurmd-{{slurm_version}}.el7.x86_64.rpm"
+  - "{{ download_path }}/slurm_rpms/slurm-centos-slurmd-{{slurm_version}}.el7.x86_64.rpm"
+
+
+pmix_download_packages:
+  - "pmix-centos-3.2.4-1.el{{ansible_distribution_major_version}}.x86_64.rpm"
+  - "pmix-centos-devel-3.2.4-1.el{{ansible_distribution_major_version}}.x86_64.rpm"
+
+pmix_packages:
+  - "{{ download_path }}/slurm_rpms/pmix-centos-3.2.4-1.el{{ansible_distribution_major_version}}.x86_64.rpm"
+  - "{{ download_path }}/slurm_rpms/pmix-centos-devel-3.2.4-1.el{{ansible_distribution_major_version}}.x86_64.rpm"

playbooks/roles/slurm/vars/el_vars.yml

@@ -54,9 +54,9 @@ slurm_login_packages:
 
 
 pmix_download_packages:
-  - "pmix-3.2.4-1.el7.x86_64.rpm"
-  - "pmix-devel-3.2.4-1.el7.x86_64.rpm"
+  - "pmix-3.2.4-1.el{{ansible_distribution_major_version}}.x86_64.rpm"
+  - "pmix-devel-3.2.4-1.el{{ansible_distribution_major_version}}.x86_64.rpm"
 
 pmix_packages:
-  - "{{ download_path }}/slurm_rpms/pmix-3.2.4-1.el7.x86_64.rpm"
-  - "{{ download_path }}/slurm_rpms/pmix-devel-3.2.4-1.el7.x86_64.rpm"
+  - "{{ download_path }}/slurm_rpms/pmix-3.2.4-1.el{{ansible_distribution_major_version}}.x86_64.rpm"
+  - "{{ download_path }}/slurm_rpms/pmix-devel-3.2.4-1.el{{ansible_distribution_major_version}}.x86_64.rpm"