openstack/tripleo-heat-templates
Code Issues Proposed changes

Remove NO_SIGNAL from ControllerBootstrapNodeDeployment

Browse Source 
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
This commit is contained in:
Steven Hardy 2015-05-14 07:05:34 -04:00 committed by Giulio Fidente
parent ce34efda2f
commit b1ae63bb11
3 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bootstrap-config.yaml
View File

@ -12,6 +12,7 @@ resources:
BootstrapNodeConfigImpl: BootstrapNodeConfigImpl:
type: OS::Heat::StructuredConfig type: OS::Heat::StructuredConfig
properties: properties:
group: os-apply-config
config: config:
bootstrap_host: bootstrap_host:
bootstrap_nodeid: {get_param: bootstrap_nodeid} bootstrap_nodeid: {get_param: bootstrap_nodeid}

1
overcloud-without-mergepy.yaml
View File

@ -810,7 +810,6 @@ resources:
properties: properties:
config: {get_attr: [ControllerBootstrapNodeConfig, config_id]} config: {get_attr: [ControllerBootstrapNodeConfig, config_id]}
servers: {get_attr: [Controller, attributes, nova_server_resource]} servers: {get_attr: [Controller, attributes, nova_server_resource]}
signal_transport: NO_SIGNAL
ControllerSwiftDeployment: ControllerSwiftDeployment:
type: OS::Heat::StructuredDeployments type: OS::Heat::StructuredDeployments

1
puppet/bootstrap-config.yaml
View File

@ -12,6 +12,7 @@ resources:
BootstrapNodeConfigImpl: BootstrapNodeConfigImpl:
type: OS::Heat::StructuredConfig type: OS::Heat::StructuredConfig
properties: properties:
group: os-apply-config
config: config:
hiera: hiera:
datafiles: datafiles: