MAAS

Merge lp:~andreserl/maas/correct_power_methods into lp:maas/trunk

  1. correct_power_methods
  2. Merge into trunk
Proposed by Andres Rodriguez on 2012-07-10
Status: Merged
Approved by: Raphaël Badin on 2012-07-10
Approved revision: 730
Merged at revision: 732
Proposed branch: lp:~andreserl/maas/correct_power_methods
Merge into: lp:maas/trunk
Diff against target: 16 lines (+2/-2)
1 file modified
src/provisioningserver/enum.py (+2/-2)
To merge this branch: bzr merge lp:~andreserl/maas/correct_power_methods
Reviewer Review Type Date Requested Status
Raphaël Badin (community) 2012-07-10 Approve on 2012-07-10
Review via email: mp+114198@code.launchpad.net

Commit Message

Set correct naming for ipmi power methods

To post a comment you must log in.
Raphaël Badin (rvb) wrote :

Look good.

A little background behind this change:

First, note that, as MAAS is concerned, these values are purely internal (the only problem that could arise is that these values are used to find the power templates in src/provisioningserver/power/templates/ but right now, we only have templates for 'virsh' and 'ether_wake').

*But* these values are still sent to cobbler when saving a node so they need to match cobbler's power setting names. Hence this change.

That change can be rolled back when we'll ditch cobbler.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/provisioningserver/enum.py'
2--- src/provisioningserver/enum.py 2012-05-21 01:50:42 +0000
3+++ src/provisioningserver/enum.py 2012-07-10 14:27:18 +0000
4@@ -56,10 +56,10 @@
5 WAKE_ON_LAN = 'ether_wake'
6
7 # IPMI (Intelligent Platform Management Interface).
8- IPMI = 'ipmi'
9+ IPMI = 'ipmitool'
10
11 # IPMI over LAN.
12- IPMI_LAN = 'ipmi_lan'
13+ IPMI_LAN = 'ipmilan'
14
15
16 POWER_TYPE_CHOICES = (