Add new midonet_agent profile.

We include this from the midonet profile (which is for the controller).
Agent will also get used on compute nodes as well.

Change-Id: I2393fc3c360f5f5786411f64dbcd06f380376093

diff --git a/manifests/profile/base/neutron/agents/midonet.pp b/manifests/profile/base/neutron/agents/midonet.pp
new file mode 100644 (file)
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/midonet.pp b/manifests/profile/base/neutron/midonet.pp
index 972856f..3276b82 100644 (file)
--- 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,