---
cobbler/item_system.py | 2 +-
cobbler/modules/cli_system.py | 2 +-
installer_templates/settings.template | 1 +
setup.py | 1 +
webui_templates/system_edit.tmpl | 2 +-
5 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/cobbler/item_system.py b/cobbler/item_system.py
index ff46764..520e3c0 100644
--- a/cobbler/item_system.py
+++ b/cobbler/item_system.py
@@ -503,7 +503,7 @@ class System(item.Item):
def set_power_type(self, power_type):
power_type = power_type.lower()
- valid = "bullpap wti apc_snmp ether-wake ipmilan drac ipmitool ilo
rsai none"
+ valid = "bullpap wti apc_snmp ether-wake ipmilan drac ipmitool ilo
rsai lpar none"
choices = valid.split(" ")
choices.sort()
if power_type not in choices:
diff --git a/cobbler/modules/cli_system.py b/cobbler/modules/cli_system.py
index 96d6c3b..c8c6428 100644
--- a/cobbler/modules/cli_system.py
+++ b/cobbler/modules/cli_system.py
@@ -97,7 +97,7 @@ class SystemFunction(commands.CobblerFunction):
if not
self.matches_args(args,["dumpvars","remove","report","getks","list"]):
p.add_option("--power-pass", dest="power_pass",
help="password for power management interface")
if not
self.matches_args(args,["dumpvars","poweron","poweroff","reboot","remove","report","getks","list"]):
- p.add_option("--power-type", dest="power_type",
help="one of: none, apc_snmp, bullpap, drac, ether-wake, ilo, ipmilan,
ipmitool, wti")
+ p.add_option("--power-type", dest="power_type",
help="one of: none, apc_snmp, bullpap, drac, ether-wake, ilo, ipmilan,
ipmitool, wti, lpar")
if not
self.matches_args(args,["dumpvars","remove","report","getks","list"]):
p.add_option("--power-user", dest="power_user",
help="username for power management interface, if required")
diff --git a/installer_templates/settings.template
b/installer_templates/settings.template
index 5143d27..5572431 100644
--- a/installer_templates/settings.template
+++ b/installer_templates/settings.template
@@ -161,6 +161,7 @@ omshell_bin: /usr/bin/omshell
# ipmitool
# ilo
# rsa
+# lpar
power_management_default_type: 'ipmitool'
diff --git a/setup.py b/setup.py
index f7bf3f2..51df55b 100644
--- a/setup.py
+++ b/setup.py
@@ -219,6 +219,7 @@ if __name__ == "__main__":
(etcpath,
['templates/power_ether_wake.template']),
(etcpath, ['templates/power_wti.template']),
(etcpath, ['templates/power_ilo.template']),
+ (etcpath, ['templates/power_lpar.template']),
# templates for /usr/bin/cobbler-setup
(itemplates,
['installer_templates/modules.conf.template']),
diff --git a/webui_templates/system_edit.tmpl b/webui_templates/system_edit.tmpl
index 9f7a4a4..c99b01e 100644
--- a/webui_templates/system_edit.tmpl
+++ b/webui_templates/system_edit.tmpl
@@ -643,7 +643,7 @@ function page_onload() {
</td>
<td class="poweredit">
<select name="power_type" id="power_type">
- #set valid_power = [ "bullpap", "wti", "apc_snmp", "ether-wake",
"ipmilan", "drac", "ipmitool", "ilo", "rsa" ]
+ #set valid_power = [ "bullpap", "wti", "apc_snmp", "ether-wake",
"ipmilan", "drac", "ipmitool", "ilo", "rsa", "lpar" ]
#set nothing = valid_power.sort()
#for $value in $valid_power:
--
1.6.0.3
_______________________________________________
cobbler mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/cobbler
