summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2013-10-11 15:43:34 -0400
committerDan Prince <dprince@redhat.com>2013-10-11 15:43:34 -0400
commitaac4d516da32a0a59ddc2d6b87c8f674b45626c7 (patch)
treee22d5612d731544f35db7ce6ba89cb3545e54ed7
parent4da722abd23d3f47a5b162b629b448c140460ce0 (diff)
Add parameters for undercloud power_managers.
Adds a new PowerManager parameter for the baremetal power management driver. Change-Id: I3d3b1f8e190d9de9705b2319726cdddb5624fc83
-rw-r--r--undercloud-bm.yaml7
-rw-r--r--undercloud-vm.yaml7
2 files changed, 12 insertions, 2 deletions
diff --git a/undercloud-bm.yaml b/undercloud-bm.yaml
index 3ce0e80f..df9a4431 100644
--- a/undercloud-bm.yaml
+++ b/undercloud-bm.yaml
@@ -53,6 +53,10 @@ Parameters:
Description: The password for the nova service account, used by nova-api.
Type: String
NoEcho: true
+ PowerManager:
+ Default: nova.virt.baremetal.ipmi.IPMI
+ Description: Bare metal power manager driver.
+ Type: String
Resources:
AccessPolicy:
Properties:
@@ -150,7 +154,8 @@ Resources:
arch:
Ref: BaremetalArch
db: mysql://nova:unset@localhost/nova_bm
- power_manager: nova.virt.baremetal.ipmi.IPMI
+ power_manager:
+ Ref: PowerManager
pxe_deploy_timeout: 2400
service-password:
Ref: NovaPassword
diff --git a/undercloud-vm.yaml b/undercloud-vm.yaml
index 871e5731..95a22f81 100644
--- a/undercloud-vm.yaml
+++ b/undercloud-vm.yaml
@@ -53,6 +53,10 @@ Parameters:
Description: The password for the nova service account, used by nova-api.
Type: String
NoEcho: true
+ PowerManager:
+ Default: nova.virt.baremetal.virtual_power_driver.VirtualPowerManager
+ Description: Bare metal power manager driver.
+ Type: String
PowerUserName:
Default: stack
Description: What username to ssh to the virtual power host with.
@@ -154,7 +158,8 @@ Resources:
arch:
Ref: BaremetalArch
db: mysql://nova:unset@localhost/nova_bm
- power_manager: nova.virt.baremetal.virtual_power_driver.VirtualPowerManager
+ power_manager:
+ Ref: PowerManager
pxe_deploy_timeout: 2400
virtual_power:
user: