Make stack complete depend on all nodes

Previously the completion signal was just based on the first run of
os-refresh-config. But in this case, we actually need to wait until it
runs successfully with all hosts computed. That way we can know that
services aren't in an unstable state while that configuration rolls out.

Change-Id: I3b965c19c92b366df3069cb8e1daffa18252c884
Closes-Bug: #1337230

diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml
index 3ac423b..bb75ed9 100644 (file)
--- a/nova-compute-instance.yaml
+++ b/nova-compute-instance.yaml
@@ -182,6 +182,7 @@ Resources:
     DependsOn: [controller0Deployment]
     Type: OS::Heat::StructuredDeployment
     Properties:
+      signal_transport: NO_SIGNAL
       config: {Ref: NovaComputeConfig}
       server: {Ref: NovaCompute0}
       input_values:
@@ -226,7 +227,6 @@ Resources:
     Properties:
       config: {Ref: AllNodesConfig}
       server: {Ref: NovaCompute0}
-      signal_transport: NO_SIGNAL
   NovaCompute0Passthrough:
     Type: OS::Heat::StructuredDeployment
     Properties:

diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index 9521983..a80a24c 100644 (file)
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -329,7 +329,6 @@ Resources:
     Properties:
       group: os-apply-config
       config:
-        completion-signal: {get_input: deploy_signal_id}
         admin-password:
           Ref: AdminPassword
         admin-token:
@@ -535,10 +534,10 @@ Resources:
     Properties:
       config: {Ref: allNodesConfig}
       server: {Ref: controller0}
-      signal_transport: NO_SIGNAL
   controller0Deployment:
     Type: OS::Heat::StructuredDeployment
     Properties:
+      signal_transport: NO_SIGNAL
       config: {Ref: controllerConfig}
       server: {Ref: controller0}
       input_values:
@@ -580,6 +579,7 @@ Resources:
     Type: OS::Heat::StructuredConfig
     Properties:
       config:
+        completion-signal: {get_input: deploy_signal_id}
         hosts:
           Fn::Join:
           - "\n"