9 files changed, 19 insertions, 78 deletions
diff --git a/manifests/profile/base/ceilometer.pp b/manifests/profile/base/ceilometer.pp
index a7d62ce..97e1bb8 100644
--- a/manifests/profile/base/ceilometer.pp
+++ b/manifests/profile/base/ceilometer.pp
@@ -23,18 +23,16 @@
 #   for more details.
 #   Defaults to hiera('step')
 #
-# [*pacemaker_master*]
-#   (Optional) The master node runs some tasks
-#   one step earlier than others; disable to
-#   the node is not the master.
+# [*sync_db*]
+#   (Optional) Whether to run db sync
 #   Defaults to true
-
+#
 class tripleo::profile::base::ceilometer (
   $step             = hiera('step'),
-  $pacemaker_master = true,
+  $sync_db = true,
 ) {
 
-  if $step >= 4 or ($step >= 3 and $pacemaker_master) {
+  if $step >= 4 or ($step >= 3 and $sync_db) {
     include ::ceilometer
     include ::ceilometer::db
     include ::ceilometer::config
diff --git a/manifests/profile/base/ceilometer/collector.pp b/manifests/profile/base/ceilometer/collector.pp
index 6891f9c..34ee90b 100644
--- a/manifests/profile/base/ceilometer/collector.pp
+++ b/manifests/profile/base/ceilometer/collector.pp
@@ -33,9 +33,7 @@ class tripleo::profile::base::ceilometer::collector (
   $sync_db = true,
 ) {
 
-  class { '::tripleo::profile::base::ceilometer':
-    pacemaker_master => $sync_db,
-  }
+  include ::tripleo::profile::base::ceilometer
 
   if $step >= 3 and $sync_db {
     $ceilometer_backend = downcase(hiera('ceilometer_backend', 'mongodb'))
diff --git a/manifests/profile/base/neutron/ml2.pp b/manifests/profile/base/neutron/ml2.pp
deleted file mode 100644
index 59c74c8..0000000
--- a/manifests/profile/base/neutron/ml2.pp
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 2016 Red Hat, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-# == Class: tripleo::profile::base::neutron::ml2
-#
-# Neutron ML2 driver profile for tripleo
-#
-# === Parameters
-#
-# [*mechanism_drivers*]
-#   (Optional) The mechanism drivers to use with the Ml2 plugin
-#   Defaults to hiera('neutron::plugins::ml2::mechanism_drivers')
-#
-# [*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::ml2 (
-  $mechanism_drivers  = hiera('neutron::plugins::ml2::mechanism_drivers'),
-  $sync_db            = true,
-  $step               = hiera('step'),
-) {
-
-  warning('This class is going is deprecated and will be removed very soon, replaced by tripleo::profile::base::neutron::plugins::ml2.')
-
-  if $step >= 4 or ( $step >= 3 and $sync_db ) {
-    include ::neutron::plugins::ml2
-    include ::tripleo::profile::base::neutron
-
-    if 'cisco_n1kv' in $mechanism_drivers {
-      include ::tripleo::profile::base::neutron::n1k
-    }
-
-    if 'cisco_ucsm' in $mechanism_drivers {
-      include ::neutron::plugins::ml2::cisco::ucsm
-    }
-
-    if 'cisco_nexus'  in $mechanism_drivers {
-      include ::neutron::plugins::ml2::cisco::nexus
-      include ::neutron::plugins::ml2::cisco::type_nexus_vxlan
-    }
-
-    if 'bsn_ml2' in $mechanism_drivers {
-      include ::neutron::plugins::ml2::bigswitch::restproxy
-      include ::neutron::agents::bigswitch
-    }
-  }
-}
diff --git a/manifests/profile/base/neutron/plugins/ml2.pp b/manifests/profile/base/neutron/plugins/ml2.pp
index b462e1b..04c6244 100644
--- a/manifests/profile/base/neutron/plugins/ml2.pp
+++ b/manifests/profile/base/neutron/plugins/ml2.pp
@@ -37,9 +37,10 @@ class tripleo::profile::base::neutron::plugins::ml2 (
   $step               = hiera('step'),
 ) {
 
+  include ::tripleo::profile::base::neutron
+
   if $step >= 4 or ( $step >= 3 and $sync_db ) {
     include ::neutron::plugins::ml2
-    include ::tripleo::profile::base::neutron
 
     if 'cisco_n1kv' in $mechanism_drivers {
       include ::tripleo::profile::base::neutron::n1k
diff --git a/manifests/profile/base/neutron/plugins/nuage.pp b/manifests/profile/base/neutron/plugins/nuage.pp
index 20f93db..5d3661e 100644
--- a/manifests/profile/base/neutron/plugins/nuage.pp
+++ b/manifests/profile/base/neutron/plugins/nuage.pp
@@ -29,6 +29,9 @@ class tripleo::profile::base::neutron::plugins::nuage (
   $step    = hiera('step'),
   $sync_db = true,
 ) {
+
+  include ::tripleo::profile::base::neutron
+
   if $step >= 4 or ( $step >= 3 and $sync_db ) {
     include ::neutron::plugins::nuage
   }
diff --git a/manifests/profile/base/neutron/plugins/opencontrail.pp b/manifests/profile/base/neutron/plugins/opencontrail.pp
index 1fcb627..96d7421 100644
--- a/manifests/profile/base/neutron/plugins/opencontrail.pp
+++ b/manifests/profile/base/neutron/plugins/opencontrail.pp
@@ -29,6 +29,9 @@ class tripleo::profile::base::neutron::plugins::opencontrail (
   $step    = hiera('step'),
   $sync_db = true,
 ) {
+
+  include ::tripleo::profile::base::neutron
+
   if $step >= 4 or ( $step >= 3 and $sync_db ) {
     include ::neutron::plugins::opencontrail
   }
diff --git a/manifests/profile/base/neutron/plugins/plumgrid.pp b/manifests/profile/base/neutron/plugins/plumgrid.pp
index 7f645b9..f5cd273 100644
--- a/manifests/profile/base/neutron/plugins/plumgrid.pp
+++ b/manifests/profile/base/neutron/plugins/plumgrid.pp
@@ -31,6 +31,9 @@ class tripleo::profile::base::neutron::plugins::plumgrid (
   $step    = hiera('step'),
   $sync_db = true,
 ) {
+
+  include ::tripleo::profile::base::neutron
+
   if $step >= 4 or ( $step >= 3 and $sync_db ) {
     include ::neutron::plugins::plumgrid
   }
diff --git a/manifests/profile/base/neutron/server.pp b/manifests/profile/base/neutron/server.pp
index 320f83c..8b5539e 100644
--- a/manifests/profile/base/neutron/server.pp
+++ b/manifests/profile/base/neutron/server.pp
@@ -29,7 +29,7 @@ class tripleo::profile::base::neutron::server (
 
   include ::tripleo::profile::base::neutron
 
-  if $step >= 2 {
+  if $step >= 3 {
     include ::neutron::db::mysql
   }
 
diff --git a/manifests/profile/base/nova/api.pp b/manifests/profile/base/nova/api.pp
index 4064b1e..3b36c57 100644
--- a/manifests/profile/base/nova/api.pp
+++ b/manifests/profile/base/nova/api.pp
@@ -34,10 +34,9 @@ class tripleo::profile::base::nova::api (
 
   include ::tripleo::profile::base::nova
 
-  if $step >= 2 and $sync_db {
+  if $step >= 3 and $sync_db {
     include ::nova::db::mysql
     include ::nova::db::mysql_api
-    Exec<| title == 'galera-ready'|> -> Anchor['nova::db::begin']
   }
 
   if $step >= 4 or ($step >= 3 and $sync_db) {