From ab6196541de14b910a2c03e4ef4fcf11058e481a Mon Sep 17 00:00:00 2001
From: VilleS1 <ville.salmela@csc.fi>
Date: Thu, 30 Sep 2021 18:10:18 +0300
Subject: [PATCH] Cleanup4: remove support for FGCI packaged slurm

---
 tasks/compute.yml   | 2 +-
 tasks/redhat.yml    | 7 -------
 tasks/slurmctld.yml | 7 -------
 tasks/upgrade.yml   | 8 --------
 4 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/tasks/compute.yml b/tasks/compute.yml
index 26b53ab..2838fee 100644
--- a/tasks/compute.yml
+++ b/tasks/compute.yml
@@ -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
diff --git a/tasks/redhat.yml b/tasks/redhat.yml
index 96967e0..7f16e44 100644
--- a/tasks/redhat.yml
+++ b/tasks/redhat.yml
@@ -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'
 
diff --git a/tasks/slurmctld.yml b/tasks/slurmctld.yml
index 217cbcb..27170f7 100644
--- a/tasks/slurmctld.yml
+++ b/tasks/slurmctld.yml
@@ -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 }}
diff --git a/tasks/upgrade.yml b/tasks/upgrade.yml
index b1ee323..cd21505 100644
--- a/tasks/upgrade.yml
+++ b/tasks/upgrade.yml
@@ -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 ""