aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-06-18 07:51:27 +0000
committerGerrit Code Review <review@openstack.org>2015-06-18 07:51:27 +0000
commit9bfd786cd47ea8519a7e8ea6ec0f06896df95af7 (patch)
treefe4ac3d49df27e84aa33627ef8aa5bc28419249c
parent6cb146cd150400d47a6c19db21d0eef275a07d7b (diff)
parent2a76a43367daa75fa07fe25167fd6398bb0bc7b8 (diff)
Merge "Remove NO_SIGNAL from Controller|ObjectSwiftDeployment"
-rw-r--r--overcloud-without-mergepy.yaml2
1 files changed, 0 insertions, 2 deletions
diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml
index 36e5227a..efeef67f 100644
--- a/overcloud-without-mergepy.yaml
+++ b/overcloud-without-mergepy.yaml
@@ -1012,14 +1012,12 @@ resources:
properties:
config: {get_attr: [SwiftDevicesAndProxyConfig, config_id]}
servers: {get_attr: [Controller, attributes, nova_server_resource]}
- signal_transport: NO_SIGNAL
ObjectStorageSwiftDeployment:
type: OS::Heat::StructuredDeployments
properties:
config: {get_attr: [SwiftDevicesAndProxyConfig, config_id]}
servers: {get_attr: [ObjectStorage, attributes, nova_server_resource]}
- signal_transport: NO_SIGNAL
SwiftDevicesAndProxyConfig:
type: OS::TripleO::SwiftDevicesAndProxy::SoftwareConfig