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

Proposed by Newell Jensen on 2016-04-25
Status: Merged
Approved by: Newell Jensen on 2016-04-25
Approved revision: 4567
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 2016-04-25 Approve on 2016-04-25
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.
Lee Trager (ltrager) wrote :

LGTM!

review: Approve

Preview Diff

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

Subscribers

People subscribed via source and target branches