From 2454ca34f60c3712e5ae714aa69a19c75104c35d Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Thu, 23 Jun 2016 08:48:45 -0400 Subject: 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 --- manifests/profile/base/neutron/midonet.pp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'manifests/profile/base/neutron/midonet.pp') 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, -- cgit 1.2.3-korg