Merge lp:~craig.magina/junk/pandakit into lp:~racb/junk/pandakit

Proposed by Craig Magina on 2013-09-23
Status: Merged
Merged at revision: 93
Proposed branch: lp:~craig.magina/junk/pandakit
Merge into: lp:~racb/junk/pandakit
Diff against target: 15 lines (+4/-1)
1 file modified
pandakit/pk.py (+4/-1)
To merge this branch: bzr merge lp:~craig.magina/junk/pandakit
Reviewer Review Type Date Requested Status
Robie Basak 2013-09-23 Pending
Review via email: mp+187032@code.launchpad.net

Description of the change

Added support for configuration of per-host ipmi raw power control commands

To post a comment you must log in.
lp:~craig.magina/junk/pandakit updated on 2013-09-29
93. By Robie Basak on 2013-09-29

Added support for configuration of per-host ipmi raw power control commands

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'pandakit/pk.py'
2--- pandakit/pk.py 2012-07-04 14:00:28 +0000
3+++ pandakit/pk.py 2013-09-23 13:57:19 +0000
4@@ -18,7 +18,10 @@
5 for hostname in hostnames:
6 machine_definition = local_config['machines'][hostname]
7 if 'bmc' in machine_definition:
8- pandakit.ipmi.main(hostname, 'power', state)
9+ if 'raw' in machine_definition:
10+ pandakit.ipmi.main(hostname, machine_definition['bmc']['raw'][state])
11+ else:
12+ pandakit.ipmi.main(hostname, 'power', state)
13 elif 'relay' in machine_definition:
14 relay_name = machine_definition['relay']['name']
15 relay = local_config['relays'][relay_name]

Subscribers

People subscribed via source and target branches

to all changes: