Skip to content

Commit 6835af5

Browse files
committed
Merge branch '2.10.2' into 2.10.1_ds_updates
2 parents 37a0e93 + 73c7f36 commit 6835af5

File tree

6 files changed

+56
-5
lines changed

6 files changed

+56
-5
lines changed

playbooks/roles/cluster-cli/files/cluster

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ def list():
161161
confirmation_prompt=True)
162162
@click.option('-n', '--name', prompt='Full Name', required=True)
163163
@click.option('-i', '--uid', default=None, help='Select the userID')
164-
@click.option('-g', '--gid', default=None, help='Add to this groupID')
164+
@click.option('-g', '--gid', default="9876", help='Add to this groupID')
165165
@click.option('-nossh', '--nossh', is_flag=True, default=False, help='Flag to not generate a user-specific ssh-key pair for passwordless ssh.')
166166
def add(user, password, uid, gid, name, nossh):
167167
""" add user """

playbooks/roles/nvidia-enroot/tasks/oraclelinux-7.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
file:
111111
path: "{{enroot_top_path_checked}}/{{item}}"
112112
state: directory
113-
mode: '0775'
113+
mode: '0777'
114114
owner: opc
115115
group: "{{privilege_group_name}}"
116116
recurse: no

playbooks/roles/nvidia-enroot/tasks/ubuntu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
file:
107107
path: "{{enroot_top_path_checked}}/{{item}}"
108108
state: directory
109-
mode: '0775'
109+
mode: '0777'
110110
owner: "{{ ansible_user }}"
111111
group: "{{privilege_group_name}}"
112112
recurse: no

playbooks/roles/slurm/tasks/common.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,4 +188,8 @@
188188

189189
- name: Include pyxis prolog files
190190
include: common_pyxis.yml
191-
when: pyxis|bool
191+
when: pyxis|bool
192+
193+
- name: Include pyxis prolog files
194+
include: common_pmix.yml
195+
when: ansible_os_family == 'RedHat'
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
---
2+
3+
- name: install required packages
4+
vars:
5+
package_name:
6+
- libev
7+
- libev-devel
8+
- libevent-devel
9+
- hwloc
10+
- hwloc-devel
11+
include_role:
12+
name: safe_yum
13+
when: ansible_os_family == 'RedHat'
14+
15+
- name: Download slurm .rpm
16+
get_url:
17+
url: "https://objectstorage.eu-frankfurt-1.oraclecloud.com/p/tgnPgvPv68JpWqLklTNY86rBsJ0z7Ebp3zs7Ud4X2_R8TZFgpm26kh08QHKI3dXU/n/hpc/b/source/o/pmix/{{item}}"
18+
dest: "{{ download_path }}/slurm_rpms"
19+
when: ansible_os_family == 'RedHat' and download_path == '/tmp'
20+
with_items: "{{pmix_download_packages}}"
21+
22+
23+
- name: Download slurm .rpm
24+
get_url:
25+
url: "https://objectstorage.eu-frankfurt-1.oraclecloud.com/p/tgnPgvPv68JpWqLklTNY86rBsJ0z7Ebp3zs7Ud4X2_R8TZFgpm26kh08QHKI3dXU/n/hpc/b/source/o/pmix/{{item}}"
26+
dest: "{{ download_path }}/slurm_rpms"
27+
when: ansible_os_family == 'RedHat' and download_path != '/tmp'
28+
delegate_to: 127.0.0.1
29+
run_once: true
30+
with_items: "{{ pmix_download_packages }}"
31+
32+
- name: install PMIx packages RedHat
33+
vars:
34+
package_name: '{{ pmix_packages }}'
35+
disable_gpg_check_var: True
36+
include_role:
37+
name: safe_yum
38+
when: ansible_os_family == 'RedHat'

playbooks/roles/slurm/vars/el_vars.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,13 @@ slurm_backup_server_packages:
5050
slurm_login_packages:
5151
- "{{ download_path }}/slurm_rpms/slurm-pam_slurm-{{slurm_version}}.el{{ansible_distribution_major_version}}.x86_64.rpm"
5252
- "{{ download_path }}/slurm_rpms/slurm-libpmi-{{slurm_version}}.el{{ansible_distribution_major_version}}.x86_64.rpm"
53-
- "{{ download_path }}/slurm_rpms/slurm-slurmd-{{slurm_version}}.el{{ansible_distribution_major_version}}.x86_64.rpm"
53+
- "{{ download_path }}/slurm_rpms/slurm-slurmd-{{slurm_version}}.el{{ansible_distribution_major_version}}.x86_64.rpm"
54+
55+
56+
pmix_download_packages:
57+
- "pmix-3.2.4-1.el7.x86_64.rpm"
58+
- "pmix-devel-3.2.4-1.el7.x86_64.rpm"
59+
60+
pmix_packages:
61+
- "{{ download_path }}/slurm_rpms/pmix-3.2.4-1.el7.x86_64.rpm"
62+
- "{{ download_path }}/slurm_rpms/pmix-devel-3.2.4-1.el7.x86_64.rpm"

0 commit comments

Comments
 (0)