MAAS

Merge ~andreserl/maas:lp1609496 into maas:master

  1. Git
  2. lp:~andreserl/maas
  3. lp1609496
  4. Merge into master
Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: 8a42cf86222aace7a4462137a7d941e9535604ef
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~andreserl/maas:lp1609496
Merge into: maas:master
Diff against target: 13 lines (+1/-1)
1 file modified
src/provisioningserver/drivers/power/ipmi.py (+1/-1)
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Newell Jensen (community) Approve
Review via email: mp+327339@code.launchpad.net

Commit message

LP: #1609496 - Increase & add 'wait_time' for IPMI to allow it working for older & broken BMC's

To post a comment you must log in.
Revision history for this message
Newell Jensen (newell-jensen) wrote :

Looks good. No unit tests needed as the wait_time logic is tested in provisioningserver.drivers.power.tests.test_base.

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

LANDING
-b lp1609496 lp:~andreserl/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://ci-maas-jenkins.internal:8080/job/maas/job/branch-tester/93/console

Revision history for this message
MAAS Lander (maas-lander) wrote :

LANDING
-b lp1609496 lp:~andreserl/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/98/console

Revision history for this message
Andres Rodriguez (andreserl) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/provisioningserver/drivers/power/ipmi.py b/src/provisioningserver/drivers/power/ipmi.py
2index 2526a96..7b9d945 100644
3--- a/src/provisioningserver/drivers/power/ipmi.py
4+++ b/src/provisioningserver/drivers/power/ipmi.py
5@@ -176,7 +176,7 @@ class IPMIPowerDriver(PowerDriver):
6 'mac_address', "Power MAC", scope=SETTING_SCOPE.NODE)
7 ]
8 ip_extractor = make_ip_extractor('power_address')
9- wait_time = (4, 8, 12)
10+ wait_time = (4, 8, 16, 32)
11
12 def detect_missing_packages(self):
13 if not shell.has_command_available('ipmipower'):

Subscribers

People subscribed via source and target branches