diff --git a/manifests/init.pp b/manifests/init.pp
index 1bc58c146..07c854a77 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -478,12 +478,8 @@ will be removed in a future release.')
     transport_url => $notification_transport_url,
   }
 
-  if ! is_service_default ($service_plugins) and ($service_plugins) {
-    if is_array($service_plugins) {
-      neutron_config { 'DEFAULT/service_plugins': value => join($service_plugins, ',') }
-    } else {
-      fail('service_plugins should be an array.')
-    }
+  neutron_config {
+    'DEFAULT/service_plugins': value => join(any2array($service_plugins), ',')
   }
 
   oslo::messaging::rabbit {'neutron_config':
diff --git a/spec/classes/neutron_init_spec.rb b/spec/classes/neutron_init_spec.rb
index 9931f8222..94bec5396 100644
--- a/spec/classes/neutron_init_spec.rb
+++ b/spec/classes/neutron_init_spec.rb
@@ -321,7 +321,9 @@ describe 'neutron' do
   end
 
   shared_examples 'without service_plugins' do
-    it { should_not contain_neutron_config('DEFAULT/service_plugins') }
+    it do
+      should contain_neutron_config('DEFAULT/service_plugins').with_value('<SERVICE DEFAULT>')
+    end
   end
 
   shared_examples 'with service_plugins' do
@@ -334,7 +336,6 @@ describe 'neutron' do
     it do
       should contain_neutron_config('DEFAULT/service_plugins').with_value('router,firewall,vpnaas,metering,qos')
     end
-
   end
 
   shared_examples 'with global_physnet_mtu defined' do