9 files changed, 131 insertions, 75 deletions
diff --git a/manifests/profile/base/neutron/agents/midonet.pp b/manifests/profile/base/neutron/agents/midonet.pp
new file mode 100644
index 0000000..52cafa9
--- /dev/null
+++ b/manifests/profile/base/neutron/agents/midonet.pp
@@ -0,0 +1,56 @@
+# 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::agents::midonet
+#
+# Midonet Neutron agent profile
+#
+# === Parameters
+#
+# [*neutron_api_node_ips*]
+#   (Optional) The IPs of the Neutron API hosts
+#   Defaults to hiera('neutron_api_node_ips')
+#
+# [*midonet_libvirt_qemu_data*]
+#   (Optional) qemu.conf data for midonet.
+#   Defaults to hiera('midonet_libvirt_qemu_data')
+#
+# [*step*]
+#   (Optional) The current step of the deployment
+#   Defaults to hiera('step')
+#
+class tripleo::profile::base::neutron::agents::midonet (
+  $neutron_api_node_ips       = hiera('neutron_api_node_ips', ''),
+  $midonet_libvirt_qemu_data  = hiera('midonet_libvirt_qemu_data', ''),
+  $step                       = hiera('step'),
+) {
+
+  if $step >= 4 {
+
+    # TODO(devvesa) provide non-controller ips for these services
+    class { '::tripleo::network::midonet::agent':
+      zookeeper_servers => $neutron_api_node_ips,
+      cassandra_seeds   => $neutron_api_node_ips
+    }
+
+    if defined(Service['libvirt']) {
+      file { '/etc/libvirt/qemu.conf':
+        ensure  => present,
+        content => hiera('midonet_libvirt_qemu_data')
+      }
+    }
+
+  }
+
+}
diff --git a/manifests/profile/base/neutron/agents/nuage.pp b/manifests/profile/base/neutron/agents/nuage.pp
new file mode 100644
index 0000000..c50feb2
--- /dev/null
+++ b/manifests/profile/base/neutron/agents/nuage.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::agents::nuage
+#
+# Nuage Neutron agent profile
+#
+# === Parameters
+#
+# [*nova_os_tenant_name*]
+#   (Optional) Nova tenant name
+#   Defaults to hiera('nova_os_tenant_name')
+#
+# [*nova_os_password*]
+#   (Optional) Nova password
+#   Defaults to hiera('nova_password')
+#
+# [*nova_metadata_ip*]
+#   (Optional) Nova metadata node IPs
+#   Defaults to hiera('nova_metadata_node_ips')
+#
+# [*nova_auth_ip*]
+#   (Optional) Nova auth IP
+#   Defaults to hiera('keystone_public_api_virtual_ip')
+#
+# [*step*]
+#   (Optional) The current step of the deployment
+#   Defaults to hiera('step')
+#
+class tripleo::profile::base::neutron::agents::nuage (
+  $nova_os_tenant_name       = hiera('nova::api::admin_tenant_name', ''),
+  $nova_os_password          = hiera('nova_password', ''),
+  $nova_metadata_ip          = hiera('nova_metadata_node_ips', ''),
+  $nova_auth_ip              = hiera('keystone_public_api_virtual_ip', ''),
+  $step                      = hiera('step'),
+) {
+
+  if $step >= 4 {
+
+    include ::nuage::vrs
+
+    class { '::nuage::metadataagent':
+      nova_os_tenant_name => $nova_os_tenant_name,
+      nova_os_password    => $nova_os_password,
+      nova_metadata_ip    => $nova_metadata_ip,
+      nova_auth_ip        => $nova_auth_ip,
+    }
+
+  }
+
+}
diff --git a/manifests/profile/base/neutron/midonet.pp b/manifests/profile/base/neutron/midonet.pp
index 972856f..3276b82 100644
--- a/manifests/profile/base/neutron/midonet.pp
+++ b/manifests/profile/base/neutron/midonet.pp
@@ -82,11 +82,9 @@ class tripleo::profile::base::neutron::midonet (
 ) {
 
   include ::tripleo::profile::base::neutron
+  include ::tripleo::profile::base::neutron::agents::midonet
 
   if $step >= 4 {
-    class { '::neutron':
-      service_plugins => []
-    }
 
     # Run zookeeper in the controller if configured
     if zk_on_controller {
@@ -106,11 +104,6 @@ class tripleo::profile::base::neutron::midonet (
       }
     }
 
-    class {'::tripleo::network::midonet::agent':
-      zookeeper_servers => $neutron_api_node_ips,
-      cassandra_seeds   => $neutron_api_node_ips
-    }
-
     class {'::tripleo::network::midonet::api':
       zookeeper_servers    => $neutron_api_node_ips,
       vip                  => $vip,
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..8218c9e 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
@@ -56,7 +57,6 @@ class tripleo::profile::base::neutron::plugins::ml2 (
 
     if 'bsn_ml2' in $mechanism_drivers {
       include ::neutron::plugins::ml2::bigswitch::restproxy
-      include ::neutron::agents::bigswitch
     }
   }
 }
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
   }