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

diff --git a/bootstrap-config.yaml b/bootstrap-config.yaml
index 6082dbc..c87670e 100644 (file)
--- 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 7c2c3a2..80e6b98 100644 (file)
--- 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 c88ed40..d88eebd 100644 (file)
--- 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: