X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=undercloud-bm-nova-deploy.yaml;h=dca68329879d20d020179d42a83c4bcf116cc404;hb=648b62d898bcc87d50c3f510e6706cf37499b2e3;hp=41cf10a5722eb53b8c275899311bd928ead83ac6;hpb=5771b718993ced4bf63e9f713a20bf5a36f2dada;p=apex-tripleo-heat-templates.git

diff --git a/undercloud-bm-nova-deploy.yaml b/undercloud-bm-nova-deploy.yaml
index 41cf10a5..dca68329 100644
--- a/undercloud-bm-nova-deploy.yaml
+++ b/undercloud-bm-nova-deploy.yaml
@@ -1,25 +1,37 @@
-Parameters:
+parameters:
   NeutronPublicInterface:
-    Default: eth2
-    Description: What interface to bridge onto br-ex for network nodes.
-    Type: String
+    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.ipmi.IPMI
-    Description: Bare metal power manager driver.
-    Type: String
+    default: nova.virt.baremetal.ipmi.IPMI
+    description: Bare metal power manager driver.
+    type: string
   PxeDeployTimeout:
-    Default: 2400
-    Description: Timeout for PXE deployment of baremetal nodes
-    Type: Number
-Resources:
-  01_undercloudNovaDeployment:
-    Type: OS::Heat::StructuredDeployment
-    Properties:
-      config: {Ref: undercloudNovaConfig}
-      server: {Ref: undercloud}
+    default: 2400
+    description: Timeout for PXE deployment of baremetal nodes
+    type: number
+resources:
+  undercloudNovaDeployment:
+    type: OS::Heat::StructuredDeployment
+    properties:
+      config: {get_resource: undercloudNovaConfig}
+      server: {get_resource: undercloud}
       signal_transport: NO_SIGNAL
       input_values:
-        nova_arch: {Ref: BaremetalArch}
-        power_manager: {Ref: PowerManager}
-        pxe_deploy_timeout: {Ref: PxeDeployTimeout}
-        nova_service_password: {Ref: NovaPassword}
+        nova_arch: {get_param: BaremetalArch}
+        power_manager: {get_param: PowerManager}
+        pxe_deploy_timeout: {get_param: PxeDeployTimeout}
+        nova_service_password: {get_param: NovaPassword}