diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-06-18 07:51:19 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-06-18 07:51:19 +0000 |
| commit | 6cb146cd150400d47a6c19db21d0eef275a07d7b (patch) | |
| tree | 27b3329772de8245942f26589f333d3261a1756e | |
| parent | 19c9618cade3aaf66c8f8f75e09077d2bf3a8b97 (diff) | |
| parent | b1ae63bb11ce92a584d5dbff4e3dc94564f5cb04 (diff) | |
Merge "Remove NO_SIGNAL from ControllerBootstrapNodeDeployment"
| -rw-r--r-- | bootstrap-config.yaml | 1 | ||||
| -rw-r--r-- | overcloud-without-mergepy.yaml | 1 | ||||
| -rw-r--r-- | puppet/bootstrap-config.yaml | 1 |
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 d3035246..36e5227a 100644 --- a/overcloud-without-mergepy.yaml +++ b/overcloud-without-mergepy.yaml @@ -1006,7 +1006,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: |