11 files changed, 21 insertions, 60 deletions
diff --git a/manifests/profile/pacemaker/neutron/dhcp.pp b/manifests/profile/pacemaker/neutron/dhcp.pp
index 1f3b178..d738f21 100644
--- a/manifests/profile/pacemaker/neutron/dhcp.pp
+++ b/manifests/profile/pacemaker/neutron/dhcp.pp
@@ -25,11 +25,11 @@
 #
 # [*pacemaker_master*]
 #   (Optional) The hostname of the pacemaker master
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('bootstrap_nodeid', undef)
 #
 class tripleo::profile::pacemaker::neutron::dhcp (
   $step             = hiera('step'),
-  $pacemaker_master = hiera('bootstrap_nodeid'),
+  $pacemaker_master = hiera('bootstrap_nodeid', undef),
 ) {
 
   include ::neutron::params
diff --git a/manifests/profile/pacemaker/neutron/l3.pp b/manifests/profile/pacemaker/neutron/l3.pp
index e1699cc..fec4af2 100644
--- a/manifests/profile/pacemaker/neutron/l3.pp
+++ b/manifests/profile/pacemaker/neutron/l3.pp
@@ -25,11 +25,11 @@
 #
 # [*pacemaker_master*]
 #   (Optional) The hostname of the pacemaker master
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('bootstrap_nodeid', undef)
 #
 class tripleo::profile::pacemaker::neutron::l3 (
   $step             = hiera('step'),
-  $pacemaker_master = hiera('bootstrap_nodeid'),
+  $pacemaker_master = hiera('bootstrap_nodeid', undef),
 ) {
 
   include ::neutron::params
diff --git a/manifests/profile/pacemaker/neutron/metadata.pp b/manifests/profile/pacemaker/neutron/metadata.pp
index e6bccb1..4fccea2 100644
--- a/manifests/profile/pacemaker/neutron/metadata.pp
+++ b/manifests/profile/pacemaker/neutron/metadata.pp
@@ -25,11 +25,11 @@
 #
 # [*pacemaker_master*]
 #   (Optional) The hostname of the pacemaker master
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('bootstrap_nodeid', undef)
 #
 class tripleo::profile::pacemaker::neutron::metadata (
   $step             = hiera('step'),
-  $pacemaker_master = hiera('bootstrap_nodeid'),
+  $pacemaker_master = hiera('bootstrap_nodeid', undef),
 ) {
 
   include ::neutron::params
diff --git a/manifests/profile/pacemaker/neutron/midonet.pp b/manifests/profile/pacemaker/neutron/midonet.pp
index a4ec831..9d380f0 100644
--- a/manifests/profile/pacemaker/neutron/midonet.pp
+++ b/manifests/profile/pacemaker/neutron/midonet.pp
@@ -25,11 +25,11 @@
 #
 # [*pacemaker_master*]
 #   (Optional) The hostname of the pacemaker master
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('bootstrap_nodeid', undef)
 #
 class tripleo::profile::pacemaker::neutron::midonet (
   $step             = hiera('step'),
-  $pacemaker_master = hiera('bootstrap_nodeid'),
+  $pacemaker_master = hiera('bootstrap_nodeid', undef),
 ) {
   include ::neutron::params
   include ::tripleo::profile::pacemaker::neutron
diff --git a/manifests/profile/pacemaker/neutron/ml2.pp b/manifests/profile/pacemaker/neutron/ml2.pp
deleted file mode 100644
index ab5a219..0000000
--- a/manifests/profile/pacemaker/neutron/ml2.pp
+++ /dev/null
@@ -1,38 +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::pacemaker::neutron::ml2
-#
-# Neutron ML2 driver Pacemaker HA profile for tripleo
-#
-# === Parameters
-#
-# [*pacemaker_master*]
-#   (Optional) The hostname of the pacemaker master
-#   Defaults to hiera('bootstrap_nodeid')
-#
-class tripleo::profile::pacemaker::neutron::ml2 (
-  $pacemaker_master = hiera('bootstrap_nodeid'),
-) {
-
-  warning('This class is going is deprecated and will be removed very soon, replaced by tripleo::profile::pacemaker::neutron::plugins::ml2.')
-
-  include ::neutron::params
-  include ::tripleo::profile::pacemaker::neutron
-
-  class { '::tripleo::profile::base::neutron::plugins::ml2':
-    sync_db => ($::hostname == downcase($pacemaker_master))
-  }
-
-}
diff --git a/manifests/profile/pacemaker/neutron/ovs.pp b/manifests/profile/pacemaker/neutron/ovs.pp
index 34ff5d3..a330de1 100644
--- a/manifests/profile/pacemaker/neutron/ovs.pp
+++ b/manifests/profile/pacemaker/neutron/ovs.pp
@@ -25,11 +25,11 @@
 #
 # [*pacemaker_master*]
 #   (Optional) The hostname of the pacemaker master
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('bootstrap_nodeid', undef)
 #
 class tripleo::profile::pacemaker::neutron::ovs (
   $step             = hiera('step'),
-  $pacemaker_master = hiera('bootstrap_nodeid'),
+  $pacemaker_master = hiera('bootstrap_nodeid', undef),
 ) {
 
   include ::neutron::params
diff --git a/manifests/profile/pacemaker/neutron/plugins/ml2.pp b/manifests/profile/pacemaker/neutron/plugins/ml2.pp
index 5ec363b..6c9d8b1 100644
--- a/manifests/profile/pacemaker/neutron/plugins/ml2.pp
+++ b/manifests/profile/pacemaker/neutron/plugins/ml2.pp
@@ -20,10 +20,10 @@
 #
 # [*pacemaker_master*]
 #   (Optional) The hostname of the pacemaker master
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('bootstrap_nodeid', undef)
 #
 class tripleo::profile::pacemaker::neutron::plugins::ml2 (
-  $pacemaker_master = hiera('bootstrap_nodeid'),
+  $pacemaker_master = hiera('bootstrap_nodeid', undef),
 ) {
 
   include ::neutron::params
diff --git a/manifests/profile/pacemaker/neutron/plugins/nuage.pp b/manifests/profile/pacemaker/neutron/plugins/nuage.pp
index 6b38884..ea40d38 100644
--- a/manifests/profile/pacemaker/neutron/plugins/nuage.pp
+++ b/manifests/profile/pacemaker/neutron/plugins/nuage.pp
@@ -20,10 +20,10 @@
 #
 # [*pacemaker_master*]
 #   (Optional) The hostname of the pacemaker master
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('bootstrap_nodeid', undef)
 #
 class tripleo::profile::pacemaker::neutron::plugins::nuage (
-  $pacemaker_master = hiera('bootstrap_nodeid'),
+  $pacemaker_master = hiera('bootstrap_nodeid', undef),
 ) {
 
   class { '::tripleo::profile::base::neutron::plugins::nuage':
diff --git a/manifests/profile/pacemaker/neutron/plugins/opencontrail.pp b/manifests/profile/pacemaker/neutron/plugins/opencontrail.pp
index 32564f4..8db3cb2 100644
--- a/manifests/profile/pacemaker/neutron/plugins/opencontrail.pp
+++ b/manifests/profile/pacemaker/neutron/plugins/opencontrail.pp
@@ -20,10 +20,10 @@
 #
 # [*pacemaker_master*]
 #   (Optional) The hostname of the pacemaker master
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('bootstrap_nodeid', undef)
 #
 class tripleo::profile::pacemaker::neutron::plugins::opencontrail (
-  $pacemaker_master = hiera('bootstrap_nodeid'),
+  $pacemaker_master = hiera('bootstrap_nodeid', undef),
 ) {
 
   class { '::tripleo::profile::base::neutron::plugins::opencontrail':
diff --git a/manifests/profile/pacemaker/neutron/plugins/plumgrid.pp b/manifests/profile/pacemaker/neutron/plugins/plumgrid.pp
index 1f2b32a..57f9e31 100644
--- a/manifests/profile/pacemaker/neutron/plugins/plumgrid.pp
+++ b/manifests/profile/pacemaker/neutron/plugins/plumgrid.pp
@@ -20,10 +20,10 @@
 #
 # [*pacemaker_master*]
 #   (Optional) The hostname of the pacemaker master
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('bootstrap_nodeid', undef)
 #
 class tripleo::profile::pacemaker::neutron::plugins::plumgrid (
-  $pacemaker_master = hiera('bootstrap_nodeid'),
+  $pacemaker_master = hiera('bootstrap_nodeid', undef),
 ) {
 
   class { '::tripleo::profile::base::neutron::plugins::plumgrid':
diff --git a/manifests/profile/pacemaker/neutron/server.pp b/manifests/profile/pacemaker/neutron/server.pp
index 0bad1b9..acd7993 100644
--- a/manifests/profile/pacemaker/neutron/server.pp
+++ b/manifests/profile/pacemaker/neutron/server.pp
@@ -20,7 +20,7 @@
 #
 # [*pacemaker_master*]
 #   (Optional) The hostname of the pacemaker master
-#   Defaults to hiera('bootstrap_nodeid')
+#   Defaults to hiera('bootstrap_nodeid', undef)
 #
 # [*step*]
 #  (Optional) The current step in deployment. See tripleo-heat-templates
@@ -28,7 +28,7 @@
 #  Defaults to hiera('step')
 #
 class tripleo::profile::pacemaker::neutron::server (
-  $pacemaker_master = hiera('bootstrap_nodeid'),
+  $pacemaker_master = hiera('bootstrap_nodeid', undef),
   $step             = hiera('step'),
 ) {
 
@@ -36,9 +36,8 @@ class tripleo::profile::pacemaker::neutron::server (
   include ::tripleo::profile::pacemaker::neutron
 
   $sync_db = ($::hostname == downcase($pacemaker_master))
-  if $step >= 2 and $sync_db {
+  if $step >= 3 and $sync_db {
     include ::neutron::db::mysql
-    Exec<| title == 'galera-ready'|> -> Class['neutron::db::mysql']
   }
 
   if $step >= 4 or ( $step >= 3 and $sync_db ) {