Merge lp:~andreserl/maas/maas_ipmi_lp1064224 into lp:~maas-committers/maas/trunk

[Andres Rodriguez]

Do not set IPMI params if detect IPMI IP Address is 0.0.0.0

This change doesn't set the IPMI settings in MAAS for a node, if it was unable to obtain the IPMI IP Address or if the obtained IPMI address is 0.0.0.0.

Note that in order to make sure we detect the correct IP address, we've also increased the wait time to 120sec's if we are changing an IPMI card from Static to DHCP.

[Andres Rodriguez (andreserl)]

Once this branch gets approved I'll propose a backport to the stabilization branch.

[Julian Edwards (julian-edwards)]

Thanks for the fix Andres - looks good, just a couple of nits:

7 # allow IPMI 60 seconds to obtain an IP address
8 - time.sleep(60)
9 + time.sleep(120)

and

45 # allow IPMI 60 seconds to obtain an IP address
46 - time.sleep(60)
47 + time.sleep(120)

Please fix the comments so they match the code :)

review: Approve

=== modified file 'contrib/preseeds_v2/enlist_userdata'
--- contrib/preseeds_v2/enlist_userdata	2012-10-11 13:55:11 +0000
+++ contrib/preseeds_v2/enlist_userdata	2012-11-13 22:43:21 +0000
@@ -143,8 +143,8 @@
        # '--dhcp-if-static' has been passed,  Set it to IPMI to DHCP.
        if not is_ipmi_dhcp() and args.dhcp:
            set_ipmi_network_source("Use_DHCP")
-           # allow IPMI 60 seconds to obtain an IP address
-           time.sleep(60)
+           # allow IPMI 120 seconds to obtain an IP address
+           time.sleep(120)
 
        # create user/pass
        if args.commission_creds:
@@ -163,6 +163,15 @@
 
        # get the IP address
        IPMI_IP_ADDRESS = get_ipmi_ip_address()
+       if IPMI_IP_ADDRESS == "0.0.0.0":
+           # if IPMI_IP_ADDRESS is 0.0.0.0, wait 60 seconds and retry.
+           time.sleep(60)
+           IPMI_IP_ADDRESS = get_ipmi_ip_address()
+
+       if IPMI_IP_ADDRESS is None or IPMI_IP_ADDRESS == "0.0.0.0":
+           # Exit (to not set power params in MAAS) if no IPMI_IP_ADDRESS
+           # has been detected
+           exit(1)
 
        if args.commission_creds:
            print get_maas_power_settings_json(IPMI_MAAS_USER, IPMI_MAAS_PASSWORD, IPMI_IP_ADDRESS)
@@ -170,7 +179,7 @@
            print get_maas_power_settings(IPMI_MAAS_USER, IPMI_MAAS_PASSWORD, IPMI_IP_ADDRESS)
 
    if __name__ == '__main__':
-       main()   
+       main()
    END_MAAS_IPMI_AUTODETECT
 
    # we could obtain the interface that booted from the kernel cmdline

=== modified file 'etc/maas/commissioning-user-data'
--- etc/maas/commissioning-user-data	2012-10-11 13:55:11 +0000
+++ etc/maas/commissioning-user-data	2012-11-13 22:43:21 +0000
@@ -294,8 +294,8 @@
     # '--dhcp-if-static' has been passed,  Set it to IPMI to DHCP.
     if not is_ipmi_dhcp() and args.dhcp:
         set_ipmi_network_source("Use_DHCP")
-        # allow IPMI 60 seconds to obtain an IP address
-        time.sleep(60)
+        # allow IPMI 120 seconds to obtain an IP address
+        time.sleep(120)
 
     # create user/pass
     IPMI_MAAS_USER="maas"
@@ -311,6 +311,15 @@
 
     # get the IP address
     IPMI_IP_ADDRESS = get_ipmi_ip_address()
+    if IPMI_IP_ADDRESS == "0.0.0.0":
+        # if IPMI_IP_ADDRESS is 0.0.0.0, wait 60 seconds and retry.
+        time.sleep(60)
+        IPMI_IP_ADDRESS = get_ipmi_ip_address()
+
+    if IPMI_IP_ADDRESS is None or IPMI_IP_ADDRESS == "0.0.0.0":
+        # Exit (to not set power params in MAAS) if no IPMI_IP_ADDRESS
+        # has been detected
+        exit(1)
 
     print get_maas_power_settings(IPMI_MAAS_USER, IPMI_MAAS_PASSWORD, IPMI_IP_ADDRESS)