aboutsummaryrefslogtreecommitdiffstats
path: root/manifests/profile/base/neutron/midonet.pp
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2016-06-23 08:48:45 -0400
committerEmilien Macchi <emilien@redhat.com>2016-07-08 14:43:30 +0000
commit2454ca34f60c3712e5ae714aa69a19c75104c35d (patch)
treeba8bbdef6f801de8dd69c5276b9f8fb66988025c /manifests/profile/base/neutron/midonet.pp
parent93c5d6103f9d4c12cd401d30b2408a8532c94922 (diff)
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
Diffstat (limited to 'manifests/profile/base/neutron/midonet.pp')
-rw-r--r--manifests/profile/base/neutron/midonet.pp9
1 files changed, 1 insertions, 8 deletions
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,