MAAS

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

  1. reset_ipmi_network_source
  2. Merge into trunk
Proposed by Andres Rodriguez
Status: Merged
Approved by: Julian Edwards
Approved revision: no longer in the source branch.
Merged at revision: 1389
Proposed branch: lp:~andreserl/maas/reset_ipmi_network_source
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 26 lines (+6/-0)
2 files modified
contrib/preseeds_v2/enlist_userdata (+3/-0)
etc/maas/commissioning-user-data (+3/-0)
To merge this branch: bzr merge lp:~andreserl/maas/reset_ipmi_network_source
Reviewer Review Type Date Requested Status
Julian Edwards (community) Approve
Review via email: mp+137278@code.launchpad.net

Commit message

Reset network source if IPMI IP address is 0.0.0.0

To post a comment you must log in.
Revision history for this message
Julian Edwards (julian-edwards) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'contrib/preseeds_v2/enlist_userdata'
--- contrib/preseeds_v2/enlist_userdata 2012-11-13 22:40:55 +0000
+++ contrib/preseeds_v2/enlist_userdata 2012-11-30 17:50:30 +0000
@@ -165,6 +165,9 @@
165 IPMI_IP_ADDRESS = get_ipmi_ip_address()165 IPMI_IP_ADDRESS = get_ipmi_ip_address()
166 if IPMI_IP_ADDRESS == "0.0.0.0":166 if IPMI_IP_ADDRESS == "0.0.0.0":
167 # if IPMI_IP_ADDRESS is 0.0.0.0, wait 60 seconds and retry.167 # if IPMI_IP_ADDRESS is 0.0.0.0, wait 60 seconds and retry.
168 set_ipmi_network_source("Static")
169 time.sleep(2)
170 set_ipmi_network_source("Use_DHCP")
168 time.sleep(60)171 time.sleep(60)
169 IPMI_IP_ADDRESS = get_ipmi_ip_address()172 IPMI_IP_ADDRESS = get_ipmi_ip_address()
170173
171174
=== modified file 'etc/maas/commissioning-user-data'
--- etc/maas/commissioning-user-data 2012-11-13 22:40:55 +0000
+++ etc/maas/commissioning-user-data 2012-11-30 17:50:30 +0000
@@ -313,6 +313,9 @@
313 IPMI_IP_ADDRESS = get_ipmi_ip_address()313 IPMI_IP_ADDRESS = get_ipmi_ip_address()
314 if IPMI_IP_ADDRESS == "0.0.0.0":314 if IPMI_IP_ADDRESS == "0.0.0.0":
315 # if IPMI_IP_ADDRESS is 0.0.0.0, wait 60 seconds and retry.315 # if IPMI_IP_ADDRESS is 0.0.0.0, wait 60 seconds and retry.
316 set_ipmi_network_source("Static")
317 time.sleep(2)
318 set_ipmi_network_source("Use_DHCP")
316 time.sleep(60)319 time.sleep(60)
317 IPMI_IP_ADDRESS = get_ipmi_ip_address()320 IPMI_IP_ADDRESS = get_ipmi_ip_address()
318321