Преглед на файлове

Merge pull request #490 from abhishek-s-a/control_plane_tools

Issue #489: Updated configure_new_devices tools
Lucas A. Wilson преди 3 години
родител
ревизия
3bcdfe0b70

+ 5 - 1
control_plane/tools/roles/configure_new_devices/tasks/main.yml

@@ -93,6 +93,10 @@
       changed_when: true
       no_log: true
 
+    - name: Wait for 10 mins for DHCP to assign IP to devices
+      wait_for:
+        timeout: "{{ dhcp_wait_time }}"
+
     - name: Launch idrac_template
       command: >-
         awx --conf.host {{ awx_host }} --conf.username {{ awx_username }} --conf.password {{ awx_password }}
@@ -101,4 +105,4 @@
       changed_when: false
       no_log: true
       when: inventory_hostname not in fetch_inventory.stdout
-  when: provisioned_idrac_inventory_name in inventory_list.stdout
+  when: provisioned_idrac_inventory_name in inventory_list.stdout

+ 2 - 1
control_plane/tools/roles/configure_new_devices/vars/main.yml

@@ -17,4 +17,5 @@
 
 # Usage: main.yml
 ethernet_template_name: "ethernet_template"
-idrac_template_name: "idrac_template"
+idrac_template_name: "idrac_template"
+dhcp_wait_time: 600

+ 2 - 2
control_plane/tools/roles/idrac_2fa/tasks/configure_smtp.yml

@@ -55,7 +55,7 @@
   register: test_email_check
   retries: 5
   no_log: true
-  ignore_errors: true
+  failed_when: false
   until: not test_email_check.failed
 
 - name: Check test email status
@@ -74,4 +74,4 @@
       EmailAlert.1.Enable: "Disabled"
     baseuri: "{{ inventory_hostname }}"
     username: "{{ idrac_username }}"
-    password: "{{ idrac_password }}"
+    password: "{{ idrac_password }}"