From b1ae63bb11ce92a584d5dbff4e3dc94564f5cb04 Mon Sep 17 00:00:00 2001
From: Steven Hardy <shardy@redhat.com>
Date: Thu, 14 May 2015 07:05:34 -0400
Subject: [PATCH] Remove NO_SIGNAL from ControllerBootstrapNodeDeployment

We need to be sure the boostrap node data has been propagated to the
cluster before proceeding with configuration, because
ControllerNodesPostDeployment consumes the data put in place by this
and depends_on for serialization, which is essentially meaningless when
combined with NO_SIGNAL.

Change-Id: I73a1e5a2cda4c79f457bfbd9ce2836dc5c1902cc
---
 bootstrap-config.yaml          | 1 +
 overcloud-without-mergepy.yaml | 1 -
 puppet/bootstrap-config.yaml   | 1 +
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/bootstrap-config.yaml b/bootstrap-config.yaml
index 6082dbced0..c87670e335 100644
--- a/bootstrap-config.yaml
+++ b/bootstrap-config.yaml
@@ -12,6 +12,7 @@ resources:
   BootstrapNodeConfigImpl:
     type: OS::Heat::StructuredConfig
     properties:
+      group: os-apply-config
       config:
         bootstrap_host:
           bootstrap_nodeid: {get_param: bootstrap_nodeid}
diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml
index 7c2c3a212d..80e6b98cc8 100644
--- a/overcloud-without-mergepy.yaml
+++ b/overcloud-without-mergepy.yaml
@@ -810,7 +810,6 @@ resources:
     properties:
       config: {get_attr: [ControllerBootstrapNodeConfig, config_id]}
       servers: {get_attr: [Controller, attributes, nova_server_resource]}
-      signal_transport: NO_SIGNAL
 
   ControllerSwiftDeployment:
     type: OS::Heat::StructuredDeployments
diff --git a/puppet/bootstrap-config.yaml b/puppet/bootstrap-config.yaml
index c88ed408b2..d88eebdff0 100644
--- a/puppet/bootstrap-config.yaml
+++ b/puppet/bootstrap-config.yaml
@@ -12,6 +12,7 @@ resources:
   BootstrapNodeConfigImpl:
     type: OS::Heat::StructuredConfig
     properties:
+      group: os-apply-config
       config:
         hiera:
           datafiles: