diff --git a/attributes/default.rb b/attributes/default.rb
index 4b43674f..de09cf10 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -1134,7 +1134,6 @@ when 'suse'
     'neutron_openvswitch_packages' => ['openvswitch-switch'],
     'neutron_openvswitch_agent_packages' => ['openstack-neutron-openvswitch-agent'],
     'neutron_linuxbridge_agent_packages' => ['openstack-neutron-linuxbridge-agent'],
-    'neutron_metadata_agent_packages' => ['openstack-neutron-metadata-agent'],
     'neutron_server_packages' => [],
     'neutron_dhcp_agent_service' => 'openstack-neutron-dhcp-agent',
     'neutron_l3_agent_service' => 'openstack-neutron-l3-agent',
diff --git a/recipes/default.rb b/recipes/default.rb
index 3acecdab..21ed778e 100644
--- a/recipes/default.rb
+++ b/recipes/default.rb
@@ -156,7 +156,7 @@ db_user = node['openstack']['db']['network']['username']
 db_pass = get_password 'db', 'neutron'
 sql_connection = db_uri('network', db_user, db_pass)
 if node['openstack']['endpoints']['db']['enabled_slave']
-  slave_connection =  db_uri('network', db_user, db_pass, true)
+  slave_connection = db_uri('network', db_user, db_pass, true)
 end
 
 network_api_bind = endpoint 'network-api-bind'
@@ -274,7 +274,7 @@ end
 case main_plugin
 when 'bigswitch'
 
-  template_file =  '/etc/neutron/plugins/bigswitch/restproxy.ini'
+  template_file = '/etc/neutron/plugins/bigswitch/restproxy.ini'
 
   template template_file do
     source 'plugins/bigswitch/restproxy.ini.erb'
diff --git a/spec/default_spec.rb b/spec/default_spec.rb
index a5e180b1..4f99dc22 100644
--- a/spec/default_spec.rb
+++ b/spec/default_spec.rb
@@ -251,7 +251,7 @@ describe 'openstack-network' do
                         firewall_driver: 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver'
 
         context 'OpenFlow Controller settings' do
-          { host: '127.0.0.1',  port: '8888', driver: 'trema', enable_packet_filter: 'true' }.each do |attr, value|
+          { host: '127.0.0.1', port: '8888', driver: 'trema', enable_packet_filter: 'true' }.each do |attr, value|
             it "sets the default #{attr} ofc value" do
               expect(chef_run).to render_file(file.name).with_content(/^#{attr} = #{value}$/)
             end
diff --git a/spec/openvswitch_spec.rb b/spec/openvswitch_spec.rb
index dc2ccc24..d974089d 100644
--- a/spec/openvswitch_spec.rb
+++ b/spec/openvswitch_spec.rb
@@ -56,14 +56,6 @@ describe 'openstack-network::openvswitch' do
       expect(chef_run).to upgrade_package 'neutron-plugin-openvswitch-agent'
     end
 
-    it 'creates the /etc/neutron/plugins/openvswitch agent directory' do
-      expect(chef_run).to create_directory('/etc/neutron/plugins/openvswitch').with(
-        owner: 'neutron',
-        group: 'neutron',
-        mode: 0700
-      )
-    end
-
     it 'sets the openvswitch service to start on boot' do
       expect(chef_run).to enable_service 'neutron-plugin-openvswitch-agent'
     end
diff --git a/spec/server-redhat_spec.rb b/spec/server-redhat_spec.rb
index c0f988c5..e6e99885 100644
--- a/spec/server-redhat_spec.rb
+++ b/spec/server-redhat_spec.rb
@@ -18,10 +18,6 @@ describe 'openstack-network::server' do
       expect(chef_run).to_not upgrade_package 'openstack-neutron'
     end
 
-    it 'installs the iproute packages' do
-      expect(chef_run).to upgrade_package 'iproute'
-    end
-
     it 'upgrades openstack-neutron packages' do
       expect(chef_run).to upgrade_package 'openstack-neutron'
     end
diff --git a/spec/server-suse_spec.rb b/spec/server-suse_spec.rb
index 7dbbf49e..76082cdc 100644
--- a/spec/server-suse_spec.rb
+++ b/spec/server-suse_spec.rb
@@ -23,7 +23,8 @@ describe 'openstack-network::server' do
     end
 
     it 'enables openstack-neutron service' do
-      expect(chef_run).to enable_service 'openstack-neutron'
+      expect(chef_run).to enable_service('neutron-server').with(
+        service_name: 'openstack-neutron')
     end
 
     it 'does not upgrade openvswitch package' do
diff --git a/spec/server_spec.rb b/spec/server_spec.rb
index 5fd87f93..f03d0241 100644
--- a/spec/server_spec.rb
+++ b/spec/server_spec.rb
@@ -42,7 +42,8 @@ describe 'openstack-network::server' do
       it 'allows overriding service names' do
         node.set['openstack']['network']['platform']['neutron_server_service'] = 'my-neutron-server'
 
-        expect(chef_run).to enable_service 'my-neutron-server'
+        expect(chef_run).to enable_service('neutron-server').with(
+          service_name: 'my-neutron-server')
       end
 
       it 'allows overriding package options' do