Merge pull request #564 from abhishek-s-a/provision_idrac

Issue #563: Provisioning of server without license changes

control_plane/roles/control_plane_common/tasks/fetch_base_inputs.yml

@@ -37,7 +37,7 @@
       host_network_dhcp_end_range | length < 1 or
       provision_method | length < 1 or
       default_lease_time | length < 1
-      
+
 - name: Validate default lease time
   assert:
     that:
@@ -205,12 +205,14 @@
 - name : Assert iso_file_path
   fail:
     msg: "{{ invalid_iso_file_path }}"
-  when: ( not result_path_iso_file.stat.exists ) and ( ".iso" not in  iso_file_path )
+  when: not result_path_iso_file.stat.exists
 
 - name: Fail when iso path valid but image not right
   fail:
     msg: "{{ invalid_iso_file_path }}"
-  when: ( result_path_iso_file.stat.exists ) and ( ".iso" not in iso_file_path )
+  when:
+    - result_path_iso_file.stat.exists
+    - '".iso" not in iso_file_path'
 
 #### management_net_dhcp_start_end_range
 - name: Assert management network nic

control_plane/roles/control_plane_common/tasks/password_config.yml

@@ -32,7 +32,7 @@
 
 - name: Validate input parameters are not empty
   fail:
-    msg: "{{ input_config_failure_msg }}"
+    msg: "{{ login_input_config_failure_msg }}"
   register: input_config_check
   when:
     - provision_password | length < 1 or

control_plane/roles/control_plane_common/tasks/verify_omnia_params.yml

@@ -61,7 +61,7 @@
 
 - name: Validate login node parameters when login_node_reqd is set to true
   fail:
-    msg: "{{ input_config_failure_msg }} for login_node"
+    msg: "{{ omnia_input_config_failure_msg }}"
   when:
     - ( domain_name | length < 1 or
       realm_name | length < 1 or

control_plane/roles/control_plane_common/vars/main.yml

@@ -57,7 +57,7 @@ min_username_length: 4
 file_perm: '0755'
 vault_file_perm: '0644'
 nic_min_length: 3
-input_config_failure_msg: "Please provide all the required parameters in login_vars.yml"
+login_input_config_failure_msg: "Failed. Please provide all the required parameters in login_vars.yml"
 fail_msg_provision_password: "Failed. Incorrect provision_password format provided in login_vars.yml"
 fail_msg_cobbler_password: "Failed. Incorrect cobbler_password format provided in login_vars.yml file"
 fail_msg_idrac_credentials: "Failed. Incorrect idrac_username or idrac_password format provided in login_vars.yml"
@@ -83,7 +83,7 @@ success_msg_directory_manager_password: "directory_manager_password successfully
 fail_msg_directory_manager_password: "Failed. Incorrect format provided for directory_manager_password"
 success_msg_ipa_admin_password: "ipa_admin_password successfully validated"
 fail_msg_ipa_admin_password: "Failed. Incorrect format provided for ipa_admin_password"
-input_config_failure_msg: "Input parameters cannot be empty"
+omnia_input_config_failure_msg: "Failed. Please provide all the required parameters in omnia_config.yml for for login_node"
 login_node_required_success_msg: "Login_node_required successfully validated"
 login_node_required_fail_msg: "Failed. login_node_required can be either true or false"
 

control_plane/roles/provision_idrac/tasks/check_prerequisites.yml

@@ -167,31 +167,33 @@
         idrac_password: "{{ idrac_password }}"
       register: idrac_info
 
-    - name: Set enterprise license status
-      set_fact:
-        enterprise_license: true
-        idrac_license_name: "{{ idrac_info.system_info.License[my_idx1].LicenseDescription }}"
-      with_items: "{{ idrac_info.system_info.License }}"
-      when:
-        - '"iDRAC" in idrac_info.system_info.License[my_idx1].LicenseDescription'
-        - '"Enterprise" in idrac_info.system_info.License[my_idx1].LicenseDescription'
-        - '"License" in idrac_info.system_info.License[my_idx1].LicenseDescription'
-        - '"Healthy" in idrac_info.system_info.License[my_idx1].PrimaryStatus'
-      loop_control:
-        index_var: my_idx1
-
-    - name: Set datacenter license status
-      set_fact:
-        datacenter_license: true
-        idrac_license_name: "{{ idrac_info.system_info.License[my_idx1].LicenseDescription }}"
-      with_items: "{{ idrac_info.system_info.License }}"
-      when:
-        - '"iDRAC" in idrac_info.system_info.License[my_idx2].LicenseDescription'
-        - '"Datacenter" in idrac_info.system_info.License[my_idx2].LicenseDescription'
-        - '"License" in idrac_info.system_info.License[my_idx2].LicenseDescription'
-        - '"Healthy" in idrac_info.system_info.License[my_idx2].PrimaryStatus'
-      loop_control:
-        index_var: my_idx2
+    - block:
+        - name: Set enterprise license status
+          set_fact:
+            enterprise_license: true
+            idrac_license_name: "{{ idrac_info.system_info.License[my_idx1].LicenseDescription }}"
+          with_items: "{{ idrac_info.system_info.License }}"
+          when:
+            - '"iDRAC" in idrac_info.system_info.License[my_idx1].LicenseDescription'
+            - '"Enterprise" in idrac_info.system_info.License[my_idx1].LicenseDescription'
+            - '"License" in idrac_info.system_info.License[my_idx1].LicenseDescription'
+            - '"Healthy" in idrac_info.system_info.License[my_idx1].PrimaryStatus'
+          loop_control:
+            index_var: my_idx1
+
+        - name: Set datacenter license status
+          set_fact:
+            datacenter_license: true
+            idrac_license_name: "{{ idrac_info.system_info.License[my_idx1].LicenseDescription }}"
+          with_items: "{{ idrac_info.system_info.License }}"
+          when:
+            - '"iDRAC" in idrac_info.system_info.License[my_idx2].LicenseDescription'
+            - '"Datacenter" in idrac_info.system_info.License[my_idx2].LicenseDescription'
+            - '"License" in idrac_info.system_info.License[my_idx2].LicenseDescription'
+            - '"Healthy" in idrac_info.system_info.License[my_idx2].PrimaryStatus'
+          loop_control:
+            index_var: my_idx2
+      when: idrac_info.system_info.License is defined
 
     - name: Change provision mode in absence of license
       set_fact: