6 files changed, 164 insertions, 23 deletions
diff --git a/manifests/profile/pacemaker/neutron/ml2.pp b/manifests/profile/pacemaker/neutron/ml2.pp
index 6c6e580..ab5a219 100644
--- a/manifests/profile/pacemaker/neutron/ml2.pp
+++ b/manifests/profile/pacemaker/neutron/ml2.pp
@@ -18,8 +18,21 @@
 #
 # === Parameters
 #
-class tripleo::profile::pacemaker::neutron::ml2 {
+# [*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
-  include ::tripleo::profile::base::neutron::ml2
+
+  class { '::tripleo::profile::base::neutron::plugins::ml2':
+    sync_db => ($::hostname == downcase($pacemaker_master))
+  }
+
 }
diff --git a/manifests/profile/pacemaker/neutron/plugins/ml2.pp b/manifests/profile/pacemaker/neutron/plugins/ml2.pp
new file mode 100644
index 0000000..5ec363b
--- /dev/null
+++ b/manifests/profile/pacemaker/neutron/plugins/ml2.pp
@@ -0,0 +1,36 @@
+# 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::plugins::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::plugins::ml2 (
+  $pacemaker_master = hiera('bootstrap_nodeid'),
+) {
+
+  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/plugins/nuage.pp b/manifests/profile/pacemaker/neutron/plugins/nuage.pp
new file mode 100644
index 0000000..6b38884
--- /dev/null
+++ b/manifests/profile/pacemaker/neutron/plugins/nuage.pp
@@ -0,0 +1,33 @@
+# 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::plugins::nuage
+#
+# Nuage Neutron profile for tripleo pacemaker
+#
+# === Parameters
+#
+# [*pacemaker_master*]
+#   (Optional) The hostname of the pacemaker master
+#   Defaults to hiera('bootstrap_nodeid')
+#
+class tripleo::profile::pacemaker::neutron::plugins::nuage (
+  $pacemaker_master = hiera('bootstrap_nodeid'),
+) {
+
+  class { '::tripleo::profile::base::neutron::plugins::nuage':
+    sync_db => ($::hostname == downcase($pacemaker_master))
+  }
+
+}
diff --git a/manifests/profile/pacemaker/neutron/plugins/opencontrail.pp b/manifests/profile/pacemaker/neutron/plugins/opencontrail.pp
new file mode 100644
index 0000000..32564f4
--- /dev/null
+++ b/manifests/profile/pacemaker/neutron/plugins/opencontrail.pp
@@ -0,0 +1,33 @@
+# 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::plugins::opencontrail
+#
+# Opencontrail Neutron profile for tripleo pacemaker
+#
+# === Parameters
+#
+# [*pacemaker_master*]
+#   (Optional) The hostname of the pacemaker master
+#   Defaults to hiera('bootstrap_nodeid')
+#
+class tripleo::profile::pacemaker::neutron::plugins::opencontrail (
+  $pacemaker_master = hiera('bootstrap_nodeid'),
+) {
+
+  class { '::tripleo::profile::base::neutron::plugins::opencontrail':
+    sync_db => ($::hostname == downcase($pacemaker_master))
+  }
+
+}
diff --git a/manifests/profile/pacemaker/neutron/plugins/plumgrid.pp b/manifests/profile/pacemaker/neutron/plugins/plumgrid.pp
new file mode 100644
index 0000000..1f2b32a
--- /dev/null
+++ b/manifests/profile/pacemaker/neutron/plugins/plumgrid.pp
@@ -0,0 +1,33 @@
+# Copyright 2016 PLUMgrid, 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::plugins::plumgrid
+#
+# PLUMgrid Neutron profile for tripleo pacemaker
+#
+# === Parameters
+#
+# [*pacemaker_master*]
+#   (Optional) The hostname of the pacemaker master
+#   Defaults to hiera('bootstrap_nodeid')
+#
+class tripleo::profile::pacemaker::neutron::plugins::plumgrid (
+  $pacemaker_master = hiera('bootstrap_nodeid'),
+) {
+
+  class { '::tripleo::profile::base::neutron::plugins::plumgrid':
+    sync_db => ($::hostname == downcase($pacemaker_master))
+  }
+
+}
diff --git a/manifests/profile/pacemaker/neutron/server.pp b/manifests/profile/pacemaker/neutron/server.pp
index 83e8a2a..0bad1b9 100644
--- a/manifests/profile/pacemaker/neutron/server.pp
+++ b/manifests/profile/pacemaker/neutron/server.pp
@@ -23,34 +23,27 @@
 #   Defaults to hiera('bootstrap_nodeid')
 #
 # [*step*]
-#   (Optional) The current step in deployment. See tripleo-heat-templates
-#   for more details.
-#   Defaults to hiera('step')
+#  (Optional) The current step in deployment. See tripleo-heat-templates
+#  for more details.
+#  Defaults to hiera('step')
 #
 class tripleo::profile::pacemaker::neutron::server (
   $pacemaker_master = hiera('bootstrap_nodeid'),
-  $step = hiera('step'),
+  $step             = hiera('step'),
 ) {
+
   include ::neutron::params
   include ::tripleo::profile::pacemaker::neutron
 
-  if $step >= 5 {
-
-    class { '::tripleo::profile::base::neutron::server':
-      sync_db        => ($::hostname == downcase($pacemaker_master)),
-    }
-
-    if ($::hostname == downcase($pacemaker_master)) {
-      pacemaker::constraint::base { 'keystone-to-neutron-server-constraint':
-        constraint_type => 'order',
-        first_resource  => 'openstack-core-clone',
-        second_resource => "${::neutron::params::server_service}-clone",
-        first_action    => 'start',
-        second_action   => 'start',
-        require         => [Pacemaker::Resource::Ocf['openstack-core'],
-                            Pacemaker::Resource::Service[$::neutron::params::server_service]],
-      }
-    }
+  $sync_db = ($::hostname == downcase($pacemaker_master))
+  if $step >= 2 and $sync_db {
+    include ::neutron::db::mysql
+    Exec<| title == 'galera-ready'|> -> Class['neutron::db::mysql']
+  }
 
+  if $step >= 4 or ( $step >= 3 and $sync_db ) {
+    include ::neutron::server::notifications
+    include ::neutron::server
   }
+
 }