From: Emilien Macchi <emilien@redhat.com>
Date: Tue, 10 Mar 2015 23:01:11 +0000 (-0400)
Subject: puppet: add ordering for Neutron agents
X-Git-Tag: opnfv-6.0.0~2652^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=dcce501eaacc7f0339189794184af77fe4dfaa91;p=apex-tripleo-heat-templates.git

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
---

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')],
   }