Revert "puppet: disable swift proxy and glance backend"

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

diff --git a/undercloud-vm-ironic-deploy.yaml b/undercloud-vm-ironic-deploy.yaml
index 8fff9d5..5d23495 100644 (file)
--- a/undercloud-vm-ironic-deploy.yaml
+++ b/undercloud-vm-ironic-deploy.yaml
@@ -4,15 +4,28 @@ parameters:
     description: Ironic password for keystone access
     hidden: true
   NeutronPublicInterface:
-    default: eth0
+    default: nic1
     description: What interface to bridge onto br-ex for network nodes.
     type: string
+  NovaComputeDriver:
+    default: nova.virt.ironic.driver.IronicDriver
+    description: Full class name for the Nova compute driver
+    type: string
+  NovaComputeManager:
+    default: ironic.nova.compute.manager.ClusteredComputeManager
+    description: Full class name for the Nova compute manager
+    type: string
+  NovaSchedulerHostManager:
+    default: nova.scheduler.ironic_host_manager.IronicHostManager
+    description: Full class name for the Nova scheduler host manager
+    type: string
   PowerSSHPrivateKey:
     description: Private key for using to ssh to a virtual power host.
     type: string
     hidden: true
 resources:
-  01_undercloudNovaDeployment:
+  undercloudNovaDeployment:
+    depends_on: [undercloudIronicDeployment]
     type: OS::Heat::StructuredDeployment
     properties:
       config: {get_resource: undercloudNovaConfig}
@@ -20,7 +33,7 @@ resources:
       signal_transport: NO_SIGNAL
       input_values:
         nova_service_password: {get_param: NovaPassword}
-  02_undercloudIronicDeployment:
+  undercloudIronicDeployment:
     type: OS::Heat::StructuredDeployment
     properties:
       config: {get_resource: undercloudIronicConfig}