summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-06-18 07:51:35 +0000
committerGerrit Code Review <review@openstack.org>2015-06-18 07:51:35 +0000
commitd1c93052959457f1f93d2a5e6aca7db666dc64b8 (patch)
tree1ae181dfd57506bf5cada17e79401f7e68b5a28c
parent9bfd786cd47ea8519a7e8ea6ec0f06896df95af7 (diff)
parentfc681367c74ae972293e00becd80bd4f0ab55a9d (diff)
Merge "Remove NO_SIGNAL from ControllerClusterConfig"
-rw-r--r--overcloud-without-mergepy.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml
index efeef67f..c011d817 100644
--- a/overcloud-without-mergepy.yaml
+++ b/overcloud-without-mergepy.yaml
@@ -1056,6 +1056,7 @@ resources:
ControllerClusterConfig:
type: OS::Heat::StructuredConfig
properties:
+ group: os-apply-config
config:
corosync:
nodes: {get_attr: [Controller, corosync_node]}
@@ -1073,7 +1074,6 @@ resources:
properties:
config: {get_resource: ControllerClusterConfig}
servers: {get_attr: [Controller, attributes, nova_server_resource]}
- signal_transport: NO_SIGNAL
ControllerAllNodesDeployment:
type: OS::Heat::StructuredDeployments