Make neutron server/ml2 profiles match t-h-t

This patch brings the neutron profiles and the
associated steps in line with what already happens in
t-h-t. Specifically:

 -we want to create the db $step >= 2 and $sync_db
 -we want to make sure plugin.ini exists before the neutron dbsync
 -we want to make sure the db sync runs before neutron::server starts
  when using pacemaker
 -split the neutron server profiles. They are quite different across
  pacemaker and base.

Change-Id: I52815f45a04bf3e39940b9cb116261730580a3e2

1 files changed, 4 insertions, 11 deletions

diff --git a/manifests/profile/base/neutron/server.pp b/manifests/profile/base/neutron/server.pp
index 14af56e..320f83c 100644
--- a/manifests/profile/base/neutron/server.pp
+++ b/manifests/profile/base/neutron/server.pp
@@ -18,31 +18,24 @@
 #
 # === Parameters
 #
-# [*sync_db*]
-#   (Optional) Whether to run Neutron DB sync operations
-#   Defaults to undef
-#
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
 #   for more details.
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::neutron::server (
-  $sync_db          = true,
   $step             = hiera('step'),
 ) {
 
   include ::tripleo::profile::base::neutron
 
-  if $step >= 3 and $sync_db {
+  if $step >= 2 {
     include ::neutron::db::mysql
   }
 
-  if $step >= 4 or ($step >=3 and $sync_db) {
+  if $step >= 4 {
     include ::neutron::server::notifications
-
-    class { '::neutron::server':
-      sync_db        => $sync_db,
-    }
+    include ::neutron::server
   }
+
 }