neutron: stop include ::neutron & ::neutron::config

They are already included in puppet-tripleo.

Note: in the case of Midonet pluging, keep including the class because
we set service_plugins parameter. This patch adds a TODO so we'll add it
in Hiera when doing the composable plugin in THT.

Change-Id: Ic9303df2d8622d4d4fc4ce21888f00653cf32207

puppet/manifests/overcloud_controller.pp

@@ -207,18 +207,13 @@ 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
 
   # If the value of core plugin is set to 'nuage' or'opencontrail' or 'plumgrid',
   # include nuage or opencontrail or plumgrid core plugins

puppet/manifests/overcloud_controller_pacemaker.pp

@@ -433,17 +433,14 @@ MYSQL_HOST=localhost\n",
     }
 
     # Configure Neutron
+    # 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 {
-    # Neutron class definitions
-    include ::neutron
-  }
 
-  include ::neutron::config
   if  hiera('neutron::core_plugin') == 'neutron.plugins.nuage.plugin.NuagePlugin' {
     include ::neutron::plugins::nuage
   }