X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=undercloud-vm-ironic-deploy.yaml;h=6e778e5917985c77904b81432e0aac21d5502c8c;hb=006fe1febcc31673d659fcf907fc4949b4fc644f;hp=10eb44d207938d2cf8f9dd0d9e50f4c522dbfb57;hpb=aa86b697b00111bbf5ec2f60e3eded00e3af15f8;p=apex-tripleo-heat-templates.git

diff --git a/undercloud-vm-ironic-deploy.yaml b/undercloud-vm-ironic-deploy.yaml
index 10eb44d2..6e778e59 100644
--- a/undercloud-vm-ironic-deploy.yaml
+++ b/undercloud-vm-ironic-deploy.yaml
@@ -1,31 +1,32 @@
-Parameters:
+parameters:
   IronicPassword:
-    Type: String
-    Description: Ironic password for keystone access
-    NoEcho: true
+    type: string
+    description: Ironic password for keystone access
+    hidden: true
   NeutronPublicInterface:
-    Default: eth0
-    Description: What interface to bridge onto br-ex for network nodes.
-    Type: String
+    default: eth0
+    description: What interface to bridge onto br-ex for network nodes.
+    type: string
   PowerSSHPrivateKey:
-    Description: Private key for using to ssh to a virtual power host.
-    Type: String
-    NoEcho: true
-Resources:
-  01_undercloudNovaDeployment:
-    Type: OS::Heat::StructuredDeployment
-    Properties:
-      config: {Ref: undercloudNovaConfig}
-      server: {Ref: undercloud}
+    description: Private key for using to ssh to a virtual power host.
+    type: string
+    hidden: true
+resources:
+  undercloudNovaDeployment:
+    depends_on: [undercloudIronicDeployment]
+    type: OS::Heat::StructuredDeployment
+    properties:
+      config: {get_resource: undercloudNovaConfig}
+      server: {get_resource: undercloud}
       signal_transport: NO_SIGNAL
       input_values:
-        nova_service_password: {Ref: NovaPassword}
-  02_undercloudIronicDeployment:
-    Type: OS::Heat::StructuredDeployment
-    Properties:
-      config: {Ref: undercloudIronicConfig}
-      server: {Ref: undercloud}
+        nova_service_password: {get_param: NovaPassword}
+  undercloudIronicDeployment:
+    type: OS::Heat::StructuredDeployment
+    properties:
+      config: {get_resource: undercloudIronicConfig}
+      server: {get_resource: undercloud}
       signal_transport: NO_SIGNAL
       input_values:
-        ironic_service_password: {Ref: IronicPassword}
-        virtual_power_ssh_key: {Ref: PowerSSHPrivateKey}
+        ironic_service_password: {get_param: IronicPassword}
+        virtual_power_ssh_key: {get_param: PowerSSHPrivateKey}