diff --git a/manifests/plugins/plumgrid.pp b/manifests/plugins/plumgrid.pp
index 41852b869..28b5bcfb6 100644
--- a/manifests/plugins/plumgrid.pp
+++ b/manifests/plugins/plumgrid.pp
@@ -168,6 +168,9 @@ class neutron::plugins::plumgrid (
     'PLUMgridDirector/password':             value => $password, secret =>true;
     'PLUMgridDirector/servertimeout':        value => $servertimeout;
     'database/connection':                   value => $connection;
+    'l2gateway/vendor':                      value => $l2gateway_vendor;
+    'l2gateway/sw_username':                 value => $l2gateway_sw_username;
+    'l2gateway/sw_password':                 value => $l2gateway_sw_password;
   }
 
   neutron_plumlib_plumgrid {
@@ -184,8 +187,5 @@ class neutron::plugins::plumgrid (
     'PLUMgridMetadata/nova_metadata_subnet':         value => $nova_metadata_subnet;
     'PLUMgridMetadata/metadata_proxy_shared_secret': value => $metadata_proxy_shared_secret;
     'ConnectorType/connector_type':                  value => $connector_type;
-    'l2gateway/vendor':                              value => $l2gateway_vendor;
-    'l2gateway/sw_username':                         value => $l2gateway_sw_username;
-    'l2gateway/sw_password':                         value => $l2gateway_sw_password;
   }
 }
diff --git a/spec/classes/neutron_plugins_plumgrid_spec.rb b/spec/classes/neutron_plugins_plumgrid_spec.rb
index 1b7409784..76d6823b3 100644
--- a/spec/classes/neutron_plugins_plumgrid_spec.rb
+++ b/spec/classes/neutron_plugins_plumgrid_spec.rb
@@ -72,6 +72,9 @@ describe 'neutron::plugins::plumgrid' do
       is_expected.to contain_neutron_plugin_plumgrid('PLUMgridDirector/password').with_value('<SERVICE DEFAULT>')
       is_expected.to contain_neutron_plugin_plumgrid('PLUMgridDirector/servertimeout').with_value(params[:servertimeout])
       is_expected.to contain_neutron_plugin_plumgrid('database/connection').with_value(params[:connection])
+      is_expected.to contain_neutron_plugin_plumgrid('l2gateway/vendor').with_value('<SERVICE DEFAULT>')
+      is_expected.to contain_neutron_plugin_plumgrid('l2gateway/sw_username').with_value('<SERVICE DEFAULT>')
+      is_expected.to contain_neutron_plugin_plumgrid('l2gateway/sw_password').with_value('<SERVICE DEFAULT>')
     end
 
     it 'should perform default configuration of plumgrid plumlib' do
@@ -89,9 +92,6 @@ describe 'neutron::plugins::plumgrid' do
       is_expected.to contain_neutron_plumlib_plumgrid('PLUMgridMetadata/nova_metadata_subnet').with_value(params[:nova_metadata_subnet])
       is_expected.to contain_neutron_plumlib_plumgrid('PLUMgridMetadata/metadata_proxy_shared_secret').with_value('<SERVICE DEFAULT>')
       is_expected.to contain_neutron_plumlib_plumgrid('ConnectorType/connector_type').with_value('distributed')
-      is_expected.to contain_neutron_plumlib_plumgrid('l2gateway/vendor').with_value('<SERVICE DEFAULT>')
-      is_expected.to contain_neutron_plumlib_plumgrid('l2gateway/sw_username').with_value('<SERVICE DEFAULT>')
-      is_expected.to contain_neutron_plumlib_plumgrid('l2gateway/sw_password').with_value('<SERVICE DEFAULT>')
     end
 
   end