diff --git a/chef/cookbooks/openstack-network/recipes/common.rb b/chef/cookbooks/openstack-network/recipes/common.rb
index 1d0deb3..e78dc47 100644
--- a/chef/cookbooks/openstack-network/recipes/common.rb
+++ b/chef/cookbooks/openstack-network/recipes/common.rb
@@ -101,7 +101,7 @@ end
 #                  rpc_backend quantum.openstack.common.rpc.impl_qpid"
 # It should be a bug of redhat OS
 execute "delete_auto_qpid" do
-  command  %Q|sed -i "s/^rpc_backend = quantum.openstack.common.rpc.impl_qpid//g" /etc/quantum/quantum.conf; sed -i "s/^qpid_hostname =//g" /etc/quantum/quantum.conf|
+  command  %Q|sed -i "s/^rpc_backend = quantum.openstack.common.rpc.impl_qpid/rpc_backend = quantum.openstack.common.rpc.impl_kombu/g" /etc/quantum/quantum.conf; sed -i "s/^qpid_hostname =//g" /etc/quantum/quantum.conf|
   only_if {
     (node['openstack']['mq']['service_type'] == "rabbitmq") and 
     platform?(%w{fedora centos redhat}) 
diff --git a/chef/cookbooks/openstack-network/recipes/dhcp_agent.rb b/chef/cookbooks/openstack-network/recipes/dhcp_agent.rb
index b087346..d67878b 100644
--- a/chef/cookbooks/openstack-network/recipes/dhcp_agent.rb
+++ b/chef/cookbooks/openstack-network/recipes/dhcp_agent.rb
@@ -46,10 +46,10 @@ package platform_options["quantum_plugin_package"].gsub("%plugin%", main_plugin)
   not_if { platform_family? "suse" }
 end
 
-execute "quantum-dhcp-setup --plugin #{main_plugin}" do
-  notifies :run, "execute[delete_auto_qpid]", :immediately
-  only_if { platform?(%w(fedora redhat centos)) } # :pragma-foodcritic: ~FC024 - won't fix this
-end
+#execute "quantum-dhcp-setup --plugin #{main_plugin}" do
+#  notifies :run, "execute[delete_auto_qpid]", :immediately
+#  only_if { platform?(%w(fedora redhat centos)) } # :pragma-foodcritic: ~FC024 - won't fix this
+#end
 
 template "/etc/quantum/dnsmasq.conf" do
   source "dnsmasq.conf.erb"
diff --git a/chef/cookbooks/openstack-network/recipes/l3_agent.rb b/chef/cookbooks/openstack-network/recipes/l3_agent.rb
index b921988..a346c04 100644
--- a/chef/cookbooks/openstack-network/recipes/l3_agent.rb
+++ b/chef/cookbooks/openstack-network/recipes/l3_agent.rb
@@ -40,13 +40,13 @@ service "quantum-l3-agent" do
   action :enable
 end
 
-execute "quantum-l3-setup --plugin #{main_plugin}" do
-  notifies :run, "execute[delete_auto_qpid]", :immediately
-  only_if {
-    platform?(%w(fedora redhat centos)) and not # :pragma-foodcritic: ~FC024 - won't fix this
-    ["nicira", "plumgrid", "bigswitch"].include?(main_plugin)
-  }
-end
+#execute "quantum-l3-setup --plugin #{main_plugin}" do
+#  notifies :run, "execute[delete_auto_qpid]", :immediately
+#  only_if {
+#    platform?(%w(fedora redhat centos)) and not # :pragma-foodcritic: ~FC024 - won't fix this
+#    ["nicira", "plumgrid", "bigswitch"].include?(main_plugin)
+#  }
+#end
 
 template "/etc/quantum/l3_agent.ini" do
   source "l3_agent.ini.erb"
diff --git a/chef/cookbooks/openstack-network/recipes/openvswitch.rb b/chef/cookbooks/openstack-network/recipes/openvswitch.rb
index 7029a51..bc70cef 100644
--- a/chef/cookbooks/openstack-network/recipes/openvswitch.rb
+++ b/chef/cookbooks/openstack-network/recipes/openvswitch.rb
@@ -113,10 +113,11 @@ execute "chkconfig openvswitch on" do
   only_if { platform?(%w(fedora redhat centos)) } 
 end
 
-execute "quantum-node-setup --plugin openvswitch" do
-  only_if { platform?(%w(fedora redhat centos)) } # :pragma-foodcritic: ~FC024 - won't fix this
-  notifies :run, "execute[delete_auto_qpid]", :immediately
-end
+#execute "quantum-node-setup --plugin openvswitch" do
+  # :pragma-foodcritic: ~FC024 - won't fix this
+#  only_if { platform?(%w(fedora redhat centos))}
+#  notifies :run, "execute[delete_auto_qpid]", :immediately
+#end
 
 if not ["nicira", "plumgrid", "bigswitch"].include?(main_plugin)
   int_bridge = node["openstack"]["network"]["openvswitch"]["integration_bridge"]
diff --git a/chef/cookbooks/openstack-network/templates/default/plugins/openvswitch/ovs_quantum_plugin.ini.erb b/chef/cookbooks/openstack-network/templates/default/plugins/openvswitch/ovs_quantum_plugin.ini.erb
index eef1862..6c18a76 100644
--- a/chef/cookbooks/openstack-network/templates/default/plugins/openvswitch/ovs_quantum_plugin.ini.erb
+++ b/chef/cookbooks/openstack-network/templates/default/plugins/openvswitch/ovs_quantum_plugin.ini.erb
@@ -18,7 +18,7 @@ reconnect_interval = 2
 # Minimum number of SQL connections to keep open in a pool
 # sql_min_pool_size = 1
 # Maximum number of SQL connections to keep open in a pool
-# sql_max_pool_size = 5
+sql_max_pool_size = 30
 # Timeout in seconds before idle sql connections are reaped
 # sql_idle_timeout = 3600
 
diff --git a/chef/roles/os-compute-worker.rb b/chef/roles/os-compute-worker.rb
index e960beb..bb275f9 100644
--- a/chef/roles/os-compute-worker.rb
+++ b/chef/roles/os-compute-worker.rb
@@ -2,6 +2,7 @@ name "os-compute-worker"
 description "The compute node, most likely with a hypervisor."
 run_list(
   "role[os-base]",
-  "recipe[openstack-compute::compute]"
+  "recipe[openstack-compute::compute]",
+  "recipe[net]"
   )
 
diff --git a/chef/roles/os-controller.rb b/chef/roles/os-controller.rb
index 7a35f03..b114378 100644
--- a/chef/roles/os-controller.rb
+++ b/chef/roles/os-controller.rb
@@ -1,4 +1,4 @@
-name "os-single-controller"
+name "os-controller"
 description "Roll-up role for all of the OpenStack Compute services on a single, non-HA controller."
 run_list(
     'role[os-dashboard]',