ml2: fix neutron-server restart

Emilien Macchi · mgagne · commit fcb68dd1395a · 2014-07-22T12:08:03.000-04:00
Only restart neutron-server on nodes hosting this service. The plugin class is not linked to neutron-server so it should not depend on it in the catalog. Closes-bug #1334906 Change-Id: I6781a8f60c04d7ef18202d378aa096c794e3fa44 (cherry picked from commit cfd0abb)
diff --git a/manifests/plugins/ml2.pp b/manifests/plugins/ml2.pp
@@ -105,7 +105,7 @@
 
   include neutron::params
 
-  Neutron_plugin_ml2<||> ~> Service['neutron-server']
+  Neutron_plugin_ml2<||> ~> Service <| title == 'neutron-server' |>
 
   # test mechanism drivers
   validate_array($mechanism_drivers)
diff --git a/spec/classes/neutron_plugins_ml2_spec.rb b/spec/classes/neutron_plugins_ml2_spec.rb
@@ -25,10 +25,7 @@
   let :pre_condition do
     "class { 'neutron':
       rabbit_password => 'passw0rd',
-      core_plugin     => 'neutron.plugins.ml2.plugin.Ml2Plugin' }
-
-     class { 'neutron::server':
-      auth_password => 'test'}"
+      core_plugin     => 'neutron.plugins.ml2.plugin.Ml2Plugin' }"
   end
 
   let :default_params do
