summaryrefslogtreecommitdiffstats
path: root/puppet/manifests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-03-11 19:07:18 +0000
committerGerrit Code Review <review@openstack.org>2015-03-11 19:07:18 +0000
commit925bd3864f693c890c84d69052fb03135a947b5c (patch)
treeee880c2cc40be31b4c057228e680cb815d8ea9c0 /puppet/manifests
parent3bb5a23da2dafd658912e2e47e427ca515757400 (diff)
parentdcce501eaacc7f0339189794184af77fe4dfaa91 (diff)
Merge "puppet: add ordering for Neutron agents"
Diffstat (limited to 'puppet/manifests')
-rw-r--r--puppet/manifests/overcloud_controller.pp5
1 files changed, 5 insertions, 0 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 390eddac..fcf059d6 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -244,6 +244,11 @@ if hiera('step') >= 2 {
auth_url => join(['http://', hiera('controller_virtual_ip'), ':35357/v2.0']),
}
+ Service['neutron-server'] -> Service['neutron-dhcp-service']
+ Service['neutron-server'] -> Service['neutron-l3']
+ Service['neutron-server'] -> Service['neutron-ovs-agent-service']
+ Service['neutron-server'] -> Service['neutron-metadata']
+
class {'cinder':
rabbit_hosts => [hiera('controller_virtual_ip')],
}