aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/manifests
diff options
context:
space:
mode:
authorEmilien Macchi <emilien@redhat.com>2015-03-10 19:01:11 -0400
committerEmilien Macchi <emilien@redhat.com>2015-03-10 19:03:40 -0400
commitdcce501eaacc7f0339189794184af77fe4dfaa91 (patch)
tree5e9d9c31e37d8918675db142addd5bc5d796ec78 /puppet/manifests
parent83a9562b377623279aae170f86c024c2c27e341f (diff)
puppet: add ordering for Neutron agents
Before starting the Neutron agents, we need to make sure neutron-server is running so we don't have a race when starting the services. This patch adds some orchestration to do it. Change-Id: I24db069d6af1fadd302b0924f769db3f58f65685
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 d6be9201..9bda0467 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')],
}