Merge "Adding NTP to undercloud template"

[apex-tripleo-heat-templates.git] / undercloud-vm-source.yaml

diff --git a/undercloud-vm-source.yaml b/undercloud-vm-source.yaml
index a898707..48a6fff 100644 (file)
--- a/undercloud-vm-source.yaml
+++ b/undercloud-vm-source.yaml
@@ -7,6 +7,14 @@ Parameters:
     Default: nova.virt.baremetal.virtual_power_driver.VirtualPowerManager
     Description: Bare metal power manager driver.
     Type: String
+  PowerSSHHost:
+    Default: 192.168.122.1
+    Description: SSH host to ssh to for power management operations.
+    Type: String
+  PowerSSHPrivateKey:
+    Description: Private key for using to ssh to a virtual power host.
+    Type: String
+    NoEcho: true
   PowerUserName:
     Default: stack
     Description: What username to ssh to the virtual power host with.
@@ -26,7 +34,6 @@ Resources:
           ram_allocation_ratio: 1.0
           reserved_host_memory_mb: 0
         baremetal:
-          use_file_injection: "False"
           arch:
             Ref: BaremetalArch
           db: mysql://nova:unset@localhost/nova_bm
@@ -36,8 +43,10 @@ Resources:
           virtual_power:
             user:
               Ref: PowerUserName
-            key: /opt/stack/boot-stack/virtual-power-key
-            ssh_host: 192.168.122.1
+            ssh_host:
+              Ref: PowerSSHHost
+            ssh_key:
+              Ref: PowerSSHPrivateKey
             type: virsh
         service-password:
           Ref: NovaPassword