Merge pull request #109 from oci-hpc/2.10.2_ds_ldap_update

Run fix ldap before slurm role

Author: arnaudfroidmont

playbooks/new_nodes.yml

@@ -168,13 +168,19 @@
       when: enroot|default(true)|bool
     - include_role:
         name: tuned
-          
 
 - hosts: compute
   tasks:  
     - include_role: 
         name: latency_check
-      when: cluster_network|bool and not 'GPU' in shape 
+      when: cluster_network|bool and not 'GPU' in shape
+
+- hosts: all
+  become: true
+  tasks: 
+    - include_role: 
+        name: fix_ldap
+      when: ldap|default(true)|bool
 
 - hosts: compute, slurm_backup
   vars:
@@ -196,11 +202,4 @@
       when: slurm|default(false)|bool
     - include_role: 
         name: telegraf
-      when: monitoring|default(false)|bool
-
-- hosts: all
-  become: true
-  tasks: 
-    - include_role: 
-        name: fix_ldap
-      when: ldap|default(true)|bool
+      when: monitoring|default(false)|bool

playbooks/resize_add.yml

@@ -171,12 +171,18 @@
     - include_role:
         name: tuned
 
-      
 - hosts: compute_to_add
   tasks: 
     - include_role: 
         name: latency_check
-      when: cluster_network|bool and not 'GPU' in shape 
+      when: cluster_network|bool and not 'GPU' in shape
+
+- hosts: all
+  become: true
+  tasks: 
+    - include_role: 
+        name: fix_ldap
+      when: ldap|default(true)|bool
 
 - hosts: compute_to_add
   vars:
@@ -198,11 +204,4 @@
       when: slurm|default(false)|bool
     - include_role: 
         name: telegraf
-      when: monitoring|default(false)|bool
-
-- hosts: all
-  become: true
-  tasks: 
-    - include_role: 
-        name: fix_ldap
-      when: ldap|default(true)|bool
+      when: monitoring|default(false)|bool

playbooks/site.yml

@@ -286,6 +286,13 @@
     - include_role:
         name: tuned
 
+- hosts: all
+  become: true
+  tasks: 
+    - include_role: 
+        name: fix_ldap
+      when: ldap|default(true)|bool
+
 - hosts: all
   vars:
     destroy: false
@@ -305,10 +312,3 @@
     - include_role: 
         name: slurm
       when: slurm|default(false)|bool
-
-- hosts: all
-  become: true
-  tasks: 
-    - include_role: 
-        name: fix_ldap
-      when: ldap|default(true)|bool