diff options
| -rw-r--r-- | cobbler/item_system.py | 2 | ||||
| -rw-r--r-- | cobbler/modules/cli_system.py | 2 | ||||
| -rw-r--r-- | installer_templates/settings.template | 1 | ||||
| -rw-r--r-- | setup.py | 1 | ||||
| -rw-r--r-- | 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 ff46764d..520e3c02 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 96d6c3b5..c8c64286 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 5143d27a..55724310 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' @@ -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 9f7a4a4e..c99b01ea 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: |