Merge lp:~newell-jensen/maas/update-fix-1508741-1.9 into lp:maas/1.9

Proposed by Newell Jensen
Status: Merged
Approved by: Newell Jensen
Approved revision: no longer in the source branch.
Merged at revision: 4566
Proposed branch: lp:~newell-jensen/maas/update-fix-1508741-1.9
Merge into: lp:maas/1.9
Diff against target: 25 lines (+3/-1)
2 files modified
docs/changelog.rst (+2/-0)
src/provisioningserver/drivers/power/ipmi.py (+1/-1)
To merge this branch: bzr merge lp:~newell-jensen/maas/update-fix-1508741-1.9
Reviewer Review Type Date Requested Status
Lee Trager (community) Approve
Review via email: mp+292834@code.launchpad.net

Commit message

Update regex used in IPMI Power Driver to be more specific. Only need to match on/off/ok.

To post a comment you must log in.
Revision history for this message
Lee Trager (ltrager) wrote :

LGTM!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'docs/changelog.rst'
--- docs/changelog.rst 2016-04-25 14:46:37 +0000
+++ docs/changelog.rst 2016-04-25 16:42:31 +0000
@@ -11,6 +11,8 @@
11Bug Fix Update11Bug Fix Update
12--------------12--------------
1313
14LP: #1508741 IPMI driver does not handle timeouts correctly
15
14LP: #1572070 MAAS 2.0 cannot link physical device interfaces to tagged vlans, breaking juju 2.0 multi-NIC containers16LP: #1572070 MAAS 2.0 cannot link physical device interfaces to tagged vlans, breaking juju 2.0 multi-NIC containers
1517
16LP: #1573046 14.04 images not available for commissioning as distrio-info --lts now reports xenial18LP: #1573046 14.04 images not available for commissioning as distrio-info --lts now reports xenial
1719
=== modified file 'src/provisioningserver/drivers/power/ipmi.py'
--- src/provisioningserver/drivers/power/ipmi.py 2016-04-23 00:20:52 +0000
+++ src/provisioningserver/drivers/power/ipmi.py 2016-04-25 16:42:31 +0000
@@ -99,7 +99,7 @@
99 "Failed to power %s %s: %s" % (99 "Failed to power %s %s: %s" % (
100 power_change, power_address, e.output_as_unicode))100 power_change, power_address, e.output_as_unicode))
101 else:101 else:
102 match = re.search(":\s*(o[\w]+)", output)102 match = re.search(":\s*(on|off|ok)", output)
103 if match is None:103 if match is None:
104 raise PowerError(104 raise PowerError(
105 "IPMI Power Driver unable to extract node power"105 "IPMI Power Driver unable to extract node power"

Subscribers

People subscribed via source and target branches