Skip to content

Commit

Permalink
Cleanup4: remove support for FGCI packaged slurm
Browse files Browse the repository at this point in the history
  • Loading branch information
VilleS1 committed Sep 30, 2021
1 parent 1c92e55 commit ab61965
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 23 deletions.
2 changes: 1 addition & 1 deletion tasks/compute.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@

- name: template in cgroup_allowed_devices for slurm
template: src=cgroup_allowed_devices_file.j2 dest=/etc/slurm/cgroup_allowed_devices_file.conf owner=root mode=0644
when: slurm_fact_fgci_slurmrepo_version|int > 1702 and ansible_os_family == "RedHat" and ansible_distribution_major_version == "7"
when: ansible_os_family == "RedHat" and ansible_distribution_major_version == "7"

- name: start and enable slurmd
service: name={{ slurmd_service }} state=started enabled=yes
Expand Down
7 changes: 0 additions & 7 deletions tasks/redhat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,6 @@
# check which version of slurm is installed
- include_tasks: version.yml

# include variables that are SLURM dependent
- include_vars: "{{ item }}"
with_first_found:
- "slurm_{{ slurm_fact_fgci_slurmrepo_version }}.yml"
- "slurm_default.yml"
when: slurm_repo == 'fgci'

- include_vars: slurm_ohpc.yml
when: slurm_repo == 'ohpc'

Expand Down
7 changes: 0 additions & 7 deletions tasks/slurmctld.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,6 @@
- name: start and enable munge on slurmctlds
service: name=munge state=started enabled=yes

- name: disable the slurm init script slurm on el7 on slurmctlds before 1702
service: name=slurm enabled=no
when:
- ansible_os_family == "RedHat"
- ansible_distribution_major_version == "7"
- slurm_fact_fgci_slurmrepo_version|int < 1702

- name: Increase net.core.somaxconn for slurmctld
sysctl: name=net.core.somaxconn
value={{ slurm_sysctl_core_somaxconn }}
Expand Down
8 changes: 0 additions & 8 deletions tasks/upgrade.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,2 @@
---

#### Upgrade

- name: Pause if we are upgrading between major slurm versions on the dbd host
pause: prompt="slurm is set to be upgraded on {{ inventory_hostname }}. This is a manual task. Press ENTER when the manual steps are done."
when: (slurm_fact_fgci_slurmrepo_version != reg_slurm_yum_version_major['stdout']) and (slurm_accounting_storage_host == inventory_hostname) and (reg_slurm_yum_version_major['stdout'] != "")
# if the fgci_slurmrepo variable is not same as the version installed
# if we are on the slurm accouting storage host
# if the version installed is not ""

0 comments on commit ab61965

Please sign in to comment.