1 files changed, 5 insertions, 67 deletions

diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 89569ae5..6084c954 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -36,9 +36,6 @@ if hiera('step') >= 2 {
 
   # MongoDB
   if downcase(hiera('ceilometer_backend')) == 'mongodb' {
-    include ::mongodb::globals
-    include ::mongodb::client
-    include ::mongodb::server
     # NOTE(gfidente): We need to pass the list of IPv6 addresses *with* port and
     # without the brackets as 'members' argument for the 'mongodb_replset'
     # resource.
@@ -54,11 +51,6 @@ if hiera('step') >= 2 {
 
     $mongodb_replset = hiera('mongodb::server::replset')
     $ceilometer_mongodb_conn_string = "mongodb://${mongo_node_string}/ceilometer?replicaSet=${mongodb_replset}"
-    if downcase(hiera('bootstrap_nodeid')) == $::hostname {
-      mongodb_replset { $mongodb_replset :
-        members => $mongo_node_ips_with_port_nobr,
-      }
-    }
   }
 
   if str2bool(hiera('enable_galera', true)) {
@@ -87,7 +79,6 @@ if hiera('step') >= 2 {
   # Create all the database schemas
   include ::nova::db::mysql
   include ::nova::db::mysql_api
-  include ::neutron::db::mysql
   if downcase(hiera('gnocchi_indexer_backend')) == 'mysql' {
     include ::gnocchi::db::mysql
   }
@@ -160,13 +151,7 @@ if hiera('step') >= 4 {
     memcached_servers => $memcached_servers
   }
   include ::nova::config
-  include ::nova::api
-  include ::nova::cert
-  include ::nova::consoleauth
   include ::nova::network::neutron
-  include ::nova::vncproxy
-  include ::nova::scheduler
-  include ::nova::scheduler::filter
 
   if hiera('neutron::core_plugin') == 'midonet.neutron.plugin_v1.MidonetPluginV2' {
 
@@ -209,36 +194,21 @@ if hiera('step') >= 4 {
     }
 
     # TODO: find a way to get an empty list from hiera
+    # TODO: when doing the composable midonet plugin, don't forget to
+    # set service_plugins to an empty array in Hiera.
     class {'::neutron':
       service_plugins => []
     }
 
   }
-  else {
-
-    # ML2 plugin
-    include ::neutron
-  }
-
-  include ::neutron::config
-  include ::neutron::server
-  include ::neutron::server::notifications
 
-  # If the value of core plugin is set to 'nuage' or'opencontrail' or 'plumgrid',
-  # include nuage or opencontrail or plumgrid core plugins
+  # If the value of core plugin is set to 'nuage' or'opencontrail'
+  # include nuage or opencontrail core plugins
   # else use the default value of 'ml2'
   if hiera('neutron::core_plugin') == 'neutron.plugins.nuage.plugin.NuagePlugin' {
     include ::neutron::plugins::nuage
   } elsif hiera('neutron::core_plugin') == 'neutron_plugin_contrail.plugins.opencontrail.contrail_plugin.NeutronPluginContrailCoreV2' {
     include ::neutron::plugins::opencontrail
-  }
-  elsif hiera('neutron::core_plugin') == 'networking_plumgrid.neutron.plugins.plugin.NeutronPluginPLUMgridV2' {
-    class { '::neutron::plugins::plumgrid' :
-      connection                   => hiera('neutron::server::database_connection'),
-      controller_priv_host         => hiera('keystone_admin_api_vip'),
-      admin_password               => hiera('admin_password'),
-      metadata_proxy_shared_secret => hiera('nova::api::neutron_metadata_proxy_shared_secret'),
-    }
   } else {
 
     # If the value of core plugin is set to 'midonet',
@@ -250,42 +220,10 @@ if hiera('step') >= 4 {
         keystone_tenant   => hiera('neutron::server::auth_tenant'),
         keystone_password => hiera('neutron::server::password')
       }
-    } else {
-
-      include ::neutron::plugins::ml2
-      include ::neutron::agents::ml2::ovs
-
-      if 'cisco_n1kv' in hiera('neutron::plugins::ml2::mechanism_drivers') {
-        include ::neutron::plugins::ml2::cisco::nexus1000v
-
-        class { '::neutron::agents::n1kv_vem':
-          n1kv_source  => hiera('n1kv_vem_source', undef),
-          n1kv_version => hiera('n1kv_vem_version', undef),
-        }
-
-        class { '::n1k_vsm':
-          n1kv_source       => hiera('n1kv_vsm_source', undef),
-          n1kv_version      => hiera('n1kv_vsm_version', undef),
-          pacemaker_control => false,
-        }
-      }
-
-      if 'cisco_ucsm' in hiera('neutron::plugins::ml2::mechanism_drivers') {
-        include ::neutron::plugins::ml2::cisco::ucsm
-      }
-      if 'cisco_nexus' in hiera('neutron::plugins::ml2::mechanism_drivers') {
-        include ::neutron::plugins::ml2::cisco::nexus
-        include ::neutron::plugins::ml2::cisco::type_nexus_vxlan
-      }
-
-      if 'bsn_ml2' in hiera('neutron::plugins::ml2::mechanism_drivers') {
-        include ::neutron::plugins::ml2::bigswitch::restproxy
-        include ::neutron::agents::bigswitch
-      }
-      Service['neutron-server'] -> Service['neutron-ovs-agent-service']
     }
 
     Service['neutron-server'] -> Service['neutron-metadata']
+
   }
 
   if $enable_ceph {