X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=undercloud-source.yaml;h=6431dfd43656323cb71632b67cb2ecb3c4573c15;hb=0757603f2ec10223a99de17123cfd9c1a6a815af;hp=9dca40276f203b3da673a44702ca58dd745793db;hpb=b9198ad03a824a12e6b5331f1995473257fb0665;p=apex-tripleo-heat-templates.git

diff --git a/undercloud-source.yaml b/undercloud-source.yaml
index 9dca4027..6431dfd4 100644
--- a/undercloud-source.yaml
+++ b/undercloud-source.yaml
@@ -50,25 +50,34 @@ Resources:
   AccessPolicy:
     Properties:
       AllowedResources:
-      - notcomputeConfig
+      - undercloudConfig
     Type: OS::Heat::AccessPolicy
   Key:
     Properties:
       UserName:
         Ref: User
     Type: AWS::IAM::AccessKey
+  CompletionCondition:
+    Type: AWS::CloudFormation::WaitCondition
+    DependsOn: undercloud
+    Properties:
+      Handle: {Ref: CompletionHandle}
+      Count: '1'
+      Timeout: '1800'
+  CompletionHandle:
+    Type: AWS::CloudFormation::WaitConditionHandle
   User:
     Properties:
       Policies:
       - Ref: AccessPolicy
     Type: AWS::IAM::User
-  notcomputeConfig:
+  undercloudConfig:
     Type: AWS::AutoScaling::LaunchConfiguration
     Properties:
       ImageId: '0'
       InstanceType: foo
     Metadata:
-      OpenStack::Role: notcomputeConfig
+      OpenStack::Role: undercloudConfig
       OpenStack::Heat::Stack: {}
       OpenStack::ImageBuilder::Elements: [ boot-stack, heat-cfntools, neutron-network-node ]
       admin-password:
@@ -81,11 +90,13 @@ Resources:
           - Fn::Select:
             - "ctlplane"
             - Fn::GetAtt:
-              - notcompute
+              - undercloud
               - networks
       cinder:
         db: mysql://cinder:unset@localhost/cinder
         volume_size_mb: '5000'
+      completion-handle:
+        Ref: CompletionHandle
       db-password: unset
       glance:
         backend: file
@@ -104,25 +115,25 @@ Resources:
           Fn::Join:
             - ''
             - - http://
-              - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [ notcompute, networks ]} ]}]}
+              - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [ undercloud, networks ]} ]}]}
               - ":8003"
         metadata_server_url:
           Fn::Join:
             - ''
             - - http://
-              - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [ notcompute, networks ]} ]}]}
+              - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [ undercloud, networks ]} ]}]}
               - ":8000"
         waitcondition_server_url:
           Fn::Join:
             - ''
             - - http://
-              - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [ notcompute, networks ]} ]}]}
+              - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [ undercloud, networks ]} ]}]}
               - ":8000/v1/waitcondition"
       os-collect-config:
         cfn:
           access_key_id:
             Ref: Key
-          path: notcomputeConfig.Metadata
+          path: undercloudConfig.Metadata
           secret_access_key:
             Fn::GetAtt:
             - Key
@@ -150,7 +161,7 @@ Resources:
       rabbit:
         host: 127.0.0.1
         password: guest
-  notcompute:
+  undercloud:
     Type: OS::Nova::Server
     Properties:
       image:
@@ -164,7 +175,7 @@ Resources:
         cfn:
           access_key_id:
             Ref: Key
-          path: notcomputeConfig.Metadata
+          path: undercloudConfig.Metadata
           secret_access_key:
             Fn::GetAtt:
             - Key