Move neutron ml2 plugins in plugins dir

Move neutron ml2 plugins in plugins directory and make it compatible
with current THT.

The old class will be removed soon.

Change-Id: I35332df5800083f3373f5c37411534d11e9b4401

diff --git a/manifests/profile/base/neutron/ml2.pp b/manifests/profile/base/neutron/ml2.pp
index d18638e..59c74c8 100644 (file)
--- a/manifests/profile/base/neutron/ml2.pp
+++ b/manifests/profile/base/neutron/ml2.pp
@@ -37,6 +37,8 @@ class tripleo::profile::base::neutron::ml2 (
   $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

diff --git a/manifests/profile/base/neutron/plugins/ml2.pp b/manifests/profile/base/neutron/plugins/ml2.pp
new file mode 100644 (file)
index 0000000..b462e1b
--- /dev/null
+++ b/manifests/profile/base/neutron/plugins/ml2.pp
@@ -0,0 +1,62 @@
+# 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::plugins::ml2
+#
+# Neutron ML2 plugin 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::plugins::ml2 (
+  $mechanism_drivers  = hiera('neutron::plugins::ml2::mechanism_drivers'),
+  $sync_db            = true,
+  $step               = hiera('step'),
+) {
+
+  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/pacemaker/neutron/ml2.pp b/manifests/profile/pacemaker/neutron/ml2.pp
index 8acaf21..ab5a219 100644 (file)
--- a/manifests/profile/pacemaker/neutron/ml2.pp
+++ b/manifests/profile/pacemaker/neutron/ml2.pp
@@ -26,10 +26,12 @@ 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::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 (file)
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))
+  }
+
+}