View | Details | Raw Unified | Return to ticket 4500
Collapse All | Expand All

(-)a/contribs/cray/csm/slurm.conf.j2 (-2 / +2 lines)
Lines 19-26 ProctrackType=proctrack/cray Link Here
19
PropagateResourceLimitsExcept=AS
19
PropagateResourceLimitsExcept=AS
20
# ReturnToService 2 will let rebooted nodes come back up immediately
20
# ReturnToService 2 will let rebooted nodes come back up immediately
21
ReturnToService=2
21
ReturnToService=2
22
SlurmctldPidFile=/var/spool/slurm/slurmctld.pid
22
SlurmctldPidFile=/var/run/slurmctld.pid
23
SlurmdPidFile=/var/spool/slurmd/slurmd.pid
23
SlurmdPidFile=/var/run/slurmd.pid
24
SlurmdSpoolDir=/var/spool/slurmd
24
SlurmdSpoolDir=/var/spool/slurmd
25
SlurmUser=root
25
SlurmUser=root
26
StateSaveLocation=/var/spool/slurm
26
StateSaveLocation=/var/spool/slurm
(-)a/contribs/cray/csm/slurm_playbook.yaml (-45 / +3 lines)
Lines 18-30 Link Here
18
    atp_spank_plugin:       /opt/cray/pe/atp/libAtpSLaunch.so
18
    atp_spank_plugin:       /opt/cray/pe/atp/libAtpSLaunch.so
19
    mcgroup_hierarchy_file: /sys/fs/cgroup/memory/memory.use_hierarchy
19
    mcgroup_hierarchy_file: /sys/fs/cgroup/memory/memory.use_hierarchy
20
    slurm_default_dir:      /opt/slurm/default
20
    slurm_default_dir:      /opt/slurm/default
21
    slurm_init_script:      /etc/init.d/slurm
22
    slurmctld_pidfile:      /var/spool/slurm/slurmctld.pid
23
    slurmctld_service_file: /usr/lib/systemd/system/slurmctld.service
24
    slurmctld_spooldir:     /var/spool/slurm
21
    slurmctld_spooldir:     /var/spool/slurm
25
    slurmd_pidfile:         /var/spool/slurmd/slurmd.pid
26
    slurmd_spooldir:        /var/spool/slurmd
22
    slurmd_spooldir:        /var/spool/slurmd
27
    slurmd_service_file:    /usr/lib/systemd/system/slurmd.service
28
    slurm_sysconfdir:       /etc/opt/slurm
23
    slurm_sysconfdir:       /etc/opt/slurm
29
24
30
  handlers:
25
  handlers:
Lines 44-49 Link Here
44
39
45
    # Some Cray software depends on the link
40
    # Some Cray software depends on the link
46
    # /opt/slurm/default -> Slurm prefix
41
    # /opt/slurm/default -> Slurm prefix
42
    - name: Create /opt/slurm directory
43
      file: path=/opt/slurm owner=root group=root mode=0755 state=directory
44
47
    - name: Link Slurm default directory
45
    - name: Link Slurm default directory
48
      file: path={{ slurm_default_dir }} src={{ prefix.stdout }} state=link
46
      file: path={{ slurm_default_dir }} src={{ prefix.stdout }} state=link
49
      when: prefix.stdout is defined and prefix.stdout != ''
47
      when: prefix.stdout is defined and prefix.stdout != ''
Lines 106-159 Link Here
106
        - /usr/lib/systemd/system/multi-user.target.wants/slurmd.service
104
        - /usr/lib/systemd/system/multi-user.target.wants/slurmd.service
107
        - /usr/lib/systemd/system/multi-user.target.wants/slurmctld.service
105
        - /usr/lib/systemd/system/multi-user.target.wants/slurmctld.service
108
106
109
    - name: Determine Slurm init.d script availability
110
      stat: path={{ slurm_init_script }}
111
      register: slurm_init
112
113
    - name: Disable Slurm init.d startup
114
      command: /usr/bin/chkconfig slurm off
115
      when: slurm_init.stat.exists
116
117
    - name: Determine slurmctld service file availability
118
      stat: path={{ slurmctld_service_file }}
119
      register: slurmctld_service
120
121
    # The default Cray slurm.conf has a nonstandard slurmctld pid file
122
    - name: Set slurmctld pid file
123
      lineinfile:
124
        dest={{ slurmctld_service_file }}
125
        regexp=PIDFile
126
        line="PIDFile={{ slurmctld_pidfile }}"
127
        backup=yes
128
      when: slurm_daemons.stdout is defined
129
        and "slurmctld" in slurm_daemons.stdout
130
        and slurmctld_service.stat.exists
131
132
    - name: Start slurmctld
107
    - name: Start slurmctld
133
      service: name=slurmctld state=started
108
      service: name=slurmctld state=started
134
      when: slurm_daemons.stdout is defined
109
      when: slurm_daemons.stdout is defined
135
        and "slurmctld" in slurm_daemons.stdout
110
        and "slurmctld" in slurm_daemons.stdout
136
        and slurmctld_service.stat.exists
137
        and not ansible_local.cray_system.in_init
111
        and not ansible_local.cray_system.in_init
138
112
139
    - name: Determine slurmd service file availability
140
      stat: path={{ slurmd_service_file }}
141
      register: slurmd_service
142
143
    # The default Cray slurm.conf has a nonstandard slurmd pid file
144
    - name: Set slurmd pid file
145
      lineinfile:
146
        dest={{ slurmd_service_file }}
147
        regexp=PIDFile
148
        line="PIDFile={{ slurmd_pidfile }}"
149
        backup=yes
150
      when: slurm_daemons.stdout is defined
151
        and "slurmd" in slurm_daemons.stdout
152
        and slurmd_service.stat.exists
153
154
    - name: Start slurmd
113
    - name: Start slurmd
155
      service: name=slurmd state=started
114
      service: name=slurmd state=started
156
      when: slurm_daemons.stdout is defined
115
      when: slurm_daemons.stdout is defined
157
        and "slurmd" in slurm_daemons.stdout
116
        and "slurmd" in slurm_daemons.stdout
158
        and slurmd_service.stat.exists
159
        and not ansible_local.cray_system.in_init
117
        and not ansible_local.cray_system.in_init

Return to ticket 4500