launchpad-reviewers team mailing list archive

[Andres Rodriguez <andreserl@xxxxxxxxxxxxx>]

Andres Rodriguez has proposed merging lp:~andreserl/maas/maas_ipmi_lp1064224 into lp:maas.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #1064224 in MAAS: "IPMI detection ends up with power_address of 0.0.0.0"
  https://bugs.launchpad.net/maas/+bug/1064224

For more details, see:
https://code.launchpad.net/~andreserl/maas/maas_ipmi_lp1064224/+merge/134144
-- 
https://code.launchpad.net/~andreserl/maas/maas_ipmi_lp1064224/+merge/134144
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~andreserl/maas/maas_ipmi_lp1064224 into lp:maas.

=== 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 15:58:43 +0000
@@ -144,7 +144,7 @@
        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)
+           time.sleep(120)
 
        # create user/pass
        if args.commission_creds:
@@ -163,6 +163,10 @@
 
        # get the IP address
        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 +174,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 15:58:43 +0000
@@ -295,7 +295,7 @@
     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)
+        time.sleep(120)
 
     # create user/pass
     IPMI_MAAS_USER="maas"
@@ -311,6 +311,10 @@
 
     # get the IP address
     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)