aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/controller-puppet.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-06-17 20:18:41 +0000
committerGerrit Code Review <review@openstack.org>2015-06-17 20:18:41 +0000
commit7691bacbde2eac6b18800096c46dbb9141a64481 (patch)
tree79b689c0ce8c44e9dd5c4b3c5c4163915644890a /puppet/controller-puppet.yaml
parent2f3116ab9f72700b572e3c8d0e8c8e37c1716633 (diff)
parentc315681cc80ec95c8e38bb0a407346525c9b0d1e (diff)
Merge "Remove NO_SIGNAL from puppet role templates"
Diffstat (limited to 'puppet/controller-puppet.yaml')
-rw-r--r--puppet/controller-puppet.yaml3
1 files changed, 1 insertions, 2 deletions
diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml
index a6c77198..67a11f00 100644
--- a/puppet/controller-puppet.yaml
+++ b/puppet/controller-puppet.yaml
@@ -532,7 +532,6 @@ resources:
NetworkDeployment:
type: OS::TripleO::SoftwareDeployment
properties:
- signal_transport: NO_SIGNAL
config: {get_resource: NetworkConfig}
server: {get_resource: Controller}
input_values:
@@ -541,8 +540,8 @@ resources:
ControllerDeployment:
type: OS::TripleO::SoftwareDeployment
+ depends_on: NetworkDeployment
properties:
- signal_transport: NO_SIGNAL
config: {get_resource: ControllerConfig}
server: {get_resource: Controller}
input_values: