Merge "Allow overlapping IPs in Neutron"

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

diff --git a/undercloud-vm-nova-deploy.yaml b/undercloud-vm-nova-deploy.yaml
index 1480938..da15b46 100644 (file)
--- a/undercloud-vm-nova-deploy.yaml
+++ b/undercloud-vm-nova-deploy.yaml
@@ -1,16 +1,24 @@
 parameters:
   NeutronPublicInterface:
-    default: eth0
+    default: nic1
     description: What interface to bridge onto br-ex for network nodes.
     type: string
+  NovaComputeDriver:
+    default: baremetal.driver.BareMetalDriver
+    description: Full class name for the Nova compute driver
+    type: string
+  NovaComputeManager:
+    default: nova.compute.manager.ComputeManager
+    description: Full class name for the Nova compute manager
+    type: string
+  NovaSchedulerHostManager:
+    default: nova.scheduler.host_manager.HostManager
+    description: Full class name for the Nova scheduler host manager
+    type: string
   PowerManager:
     default: nova.virt.baremetal.virtual_power_driver.VirtualPowerManager
     description: Bare metal power manager driver.
     type: string
-  PxeDeployTimeout:
-    default: 2400
-    description: Timeout for PXE deployment of baremetal nodes
-    type: number
   PowerSSHHost:
     default: 192.168.122.1
     description: SSH host to ssh to for power management operations.
@@ -23,8 +31,12 @@ parameters:
     default: stack
     description: What username to ssh to the virtual power host with.
     type: string
+  PxeDeployTimeout:
+    default: 2400
+    description: Timeout for PXE deployment of baremetal nodes
+    type: number
 resources:
-  01_undercloudNovaDeployment:
+  undercloudNovaDeployment:
     type: OS::Heat::StructuredDeployment
     properties:
       config: {get_resource: undercloudNovaConfig}