aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Hardy <shardy@redhat.com>2015-05-14 07:05:34 -0400
committerGiulio Fidente <gfidente@redhat.com>2015-06-03 16:30:53 +0200
commitb1ae63bb11ce92a584d5dbff4e3dc94564f5cb04 (patch)
treebe88492468d06ac87a35554e52520487bec07c42
parentce34efda2fa11dd4dc5f46877fd78a784b1b5f56 (diff)
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
-rw-r--r--bootstrap-config.yaml1
-rw-r--r--overcloud-without-mergepy.yaml1
-rw-r--r--puppet/bootstrap-config.yaml1
3 files changed, 2 insertions, 1 deletions
diff --git a/bootstrap-config.yaml b/bootstrap-config.yaml
index 6082dbce..c87670e3 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 7c2c3a21..80e6b98c 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 c88ed408..d88eebdf 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: