ol8 updates

Author: anoopna

playbooks/roles/slurm/tasks/bastion.yml

@@ -0,0 +1,30 @@
+---
+- block:
+    - name: include common tasks
+      include_tasks: common.yml
+      vars:
+        slurm_repos: "epel,ol7_developer_EPEL"
+      when: (not destroy|bool) and ((initial|bool) or (not initial|bool and ('compute' in group_names)))
+
+    - name: run server directives ol7 bastion
+      include_tasks: server.yml
+      vars:
+        slurm_repos: "epel,ol7_developer_EPEL"
+      when: ('bastion' in group_names) and (not destroy|bool) and (initial| bool)
+  when: ansible_distribution_major_version == '7'
+
+- block:
+    - name: include common tasks
+      include_tasks: common.yml
+      vars:
+        slurm_repos: "ol8_developer_EPEL,ol8_codeready_builder"
+      when: (not destroy|bool) and ((initial|bool) or (not initial|bool and ('compute' in group_names)))
+
+
+    - name: run server directives ol8 bastion
+      include_tasks: server.yml
+      vars:
+        slurm_repos: "ol8_developer_EPEL,ol8_codeready_builder"
+      when: ('bastion' in group_names) and (not destroy|bool) and (initial| bool)
+
+  when: ansible_distribution_major_version == '8'

playbooks/roles/slurm/tasks/el7.yml

@@ -1,30 +1,4 @@
 ---
-#- name: download slurm Packages
-#  include_tasks: download.yml
-#  when: ('bastion' in group_names) and (not destroy|bool) and (initial|bool) and (cluster_nfs|bool)
-
-#- name: download slurm Packages
-#  include_tasks: download.yml
-#  when: (not destroy|bool) and (not cluster_nfs|bool)
-
-- name: include common tasks
-  vars: 
-    slurm_repos: "epel,ol7_developer_EPEL"
-  include_tasks: common.yml
-  when: (not destroy|bool) and ((initial|bool) or (not initial|bool and ('compute' in group_names)))
-
-- name: run server directives ol8 bastion
-  vars:
-    slurm_repos: "ol8_developer_EPEL,ol8_codeready_builder"
-  include_tasks: server.yml
-  when: ('bastion' in group_names) and (not destroy|bool) and (initial| bool) and ansible_distribution_major_version == '8'
-
-- name: run server directives ol7 bastion
-  vars: 
-    slurm_repos: "epel,ol7_developer_EPEL"
-  include_tasks: server.yml
-  when: ('bastion' in group_names) and (not destroy|bool) and (initial| bool) and ansible_distribution_major_version == '7'
-
 - name: run compute directives
   vars: 
     slurm_repos: "epel,ol7_developer_EPEL"

playbooks/roles/slurm/tasks/el8.yml

@@ -1,30 +1,4 @@
 ---
-#- name: download slurm Packages
-#  include_tasks: download.yml
-#  when: ('bastion' in group_names) and (not destroy|bool) and (initial|bool) and (cluster_nfs|bool)
-
-#- name: download slurm Packages
-#  include_tasks: download.yml
-#  when: (not destroy|bool) and (not cluster_nfs|bool)
-
-- name: include common tasks
-  vars: 
-    slurm_repos: "ol8_developer_EPEL,ol8_codeready_builder"
-  include_tasks: common.yml
-  when: (not destroy|bool) and ((initial|bool) or (not initial|bool and ('compute' in group_names)))
-
-- name: run server directives ol7 bastion
-  vars: 
-    slurm_repos: "epel,ol7_developer_EPEL"
-  include_tasks: server.yml
-  when: ('bastion' in group_names) and (not destroy|bool) and (initial| bool) and ansible_distribution_major_version == '7'
-
-- name: run server directives ol8 bastion
-  vars: 
-    slurm_repos: "ol8_developer_EPEL,ol8_codeready_builder"
-  include_tasks: server.yml
-  when: ('bastion' in group_names) and (not destroy|bool) and (initial| bool) and ansible_distribution_major_version == '8'
-
 - name: run compute directives
   vars: 
     slurm_repos: "ol8_developer_EPEL,ol8_codeready_builder"

playbooks/roles/slurm/tasks/main.yml

@@ -7,6 +7,9 @@
 - include_vars: ubuntu_vars.yml
   when: ansible_distribution == 'Ubuntu'
 
+- include: bastion.yml
+  when: ansible_os_family == 'RedHat' and ansible_distribution == 'OracleLinux'
+  
 - include: el7.yml
   when: ansible_os_family == 'RedHat' and ansible_distribution == 'OracleLinux' and ansible_distribution_major_version == '7'