Merge branch 'dellhpc:devel' into devel

control_plane/input_params/login_vars.yml

@@ -29,25 +29,6 @@ provision_password: ""
 # Required field
 cobbler_password: ""
 
-### Usage: provision_idrac ###
-
-# The username for idrac
-# The username must not contain -,\, ',"
-# Required only if idrac_support: true
-idrac_username: ""
-
-# Password used for idrac
-# The password must not contain -,\, ',"
-# Required only if idrac_support: true
-idrac_password: ""
-
-### Usage: webui_awx ###
-
-# Password used for awx UI
-# The Length of the password should be at least 8.
-# The password must not contain -,\, ',"
-#awx_password: ""
-
 ### Usage: webui_grafana ###
 
 # The username for grafana UI
@@ -61,6 +42,30 @@ grafana_username: ""
 # The password should not be kept 'admin'
 grafana_password: ""
 
+# The directory server operations require an administrative user.
+# This user is referred to as the Directory Manager and has full access to the Directory for system management tasks
+# and will be added to the instance of directory server created for IPA.
+# The password must be at least 8 characters long
+# The password must not contain -,\, ',"
+ms_directory_manager_password: ""
+
+# ms_kerberos_admin_password used by IPA admin user in Rocky OS and used by 389-ds for kerberos admin password in leap OS
+# The IPA server requires an administrative user, named 'admin'.
+# This user is a regular system account used for IPA server administration
+ms_kerberos_admin_password: ""
+
+### Usage: provision_idrac ###
+
+# The username for idrac
+# The username must not contain -,\, ',"
+# Required only if idrac_support: true
+idrac_username: ""
+
+# Password used for idrac
+# The password must not contain -,\, ',"
+# Required only if idrac_support: true
+idrac_password: ""
+
 ### Usage: network_ethernet ###
 
 # The username for ethernet switch
@@ -92,15 +97,3 @@ powervault_me4_username: ""
 # one numeric character and one non-alphanumeric character.
 # The password must not contain -,\, ',", . , < , comma(,)
 powervault_me4_password: ""
-
-# The directory server operations require an administrative user.
-# This user is referred to as the Directory Manager and has full access to the Directory for system management tasks
-# and will be added to the instance of directory server created for IPA.
-# The password must be at least 8 characters long
-# The password must not contain -,\, ',"
-ms_directory_manager_password: ""
-
-# ms_kerberos_admin_password used by IPA admin user in Rocky OS and used by 389-ds for kerberos admin password in leap OS
-# The IPA server requires an administrative user, named 'admin'.
-# This user is a regular system account used for IPA server administration
-ms_kerberos_admin_password: ""

control_plane/roles/network_ib/tasks/global_config.yml

@@ -1,4 +1,4 @@
-# Copyright 2021 Dell Inc. or its subsidiaries. All Rights Reserved.
+# Copyright 2022 Dell Inc. or its subsidiaries. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -32,4 +32,6 @@
 - name: Status check for - "{{ inventory_hostname }}" - "{{ item }}"
   fail:
     msg: "{{ global_conf.json }}"
-  when: global_conf.json.status != "OK"
+  when: 
+    - ( global_conf.json.status is defined and global_conf.json.status != "OK" ) or 
+      ( global_conf.json.results is defined and global_conf.json.results[0].status != "OK" )

roles/common/tasks/main.yml

@@ -131,6 +131,8 @@
         name: NVIDIA
         repo: "{{ nvidia_repo }}"
         state: present
+        disable_gpg_check: yes
+        auto_import_keys: yes
         autorefresh: yes
       tags: install
 

roles/login_node/tasks/configure_alerting.yml

@@ -62,12 +62,20 @@
   changed_when: false
   register: ansible_playbook_path
 
-- name: Start cron service
+- name: Start cron service in leap
   systemd:
     name: cron
     state: started
     enabled: yes
- 
+  when: os_leap in ansible_distribution | lower
+
+- name: Start crond service in rocky
+  systemd:
+    name: crond
+    state: started
+    enabled: yes
+  when: os_leap not in ansible_distribution | lower
+
 - name: Schedule cron job for alerting
   cron:
     name: Auth failure alerting