Merge pull request rcbops-cookbooks#127 from cloudnull/Issue803

Merged automatically by jenkins after successful build test

attributes/default.rb

@@ -82,7 +82,9 @@
 default["neutron"]["notification"]["driver"] = "no_op"
 default["neutron"]["notification"]["topics"] = "notifications"
 
-default["neutron"]["database"]["sqlalchemy_pool_size"] = 5
+default["neutron"]["database"]["sqlalchemy_pool_size"] = 10
+default["neutron"]["database"]["max_overflow"] = 20
+default["neutron"]["database"]["pool_timeout"] = 10
 
 default["neutron"]["security_group_api"] = "neutron"
 default["neutron"]["isolated_metadata"] = "True"

files/default/neutron-dist.conf

@@ -0,0 +1 @@
+# Your doing it wrong REDHAT!

recipes/neutron-common.rb

@@ -98,6 +98,7 @@
 when "log"
   notification_driver = "neutron.openstack.common.notifier.log_notifier"
 else
+  notification_driver = nil
   msg = "#{notification_provider}, is not currently supported by these cookbooks."
   Chef::Application.fatal! msg
 end
@@ -175,7 +176,10 @@
     "lbaas_provider" => lbaas_provider,
     "fwaas_provider" => fwaas_provider,
     "vpnaas_provider" => vpnaas_provider,
-    "service_plugins" => service_plugins
+    "service_plugins" => service_plugins,
+    "sql_max_pool_size" => node["neutron"]["database"]["sqlalchemy_pool_size"],
+    "sql_max_overflow" => node["neutron"]["database"]["max_overflow"],
+    "sql_pool_timeout" => node["neutron"]["database"]["pool_timeout"]
   )
 end
 
@@ -223,4 +227,12 @@
     link "/etc/neutron/plugin.ini" do
       to "/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini"
     end
+
+  # RHEL YOUR DOING IT WRONG!
+  cookbook_file "/usr/share/neutron/neutron-dist.conf" do
+    source "neutron-dist.conf"
+    mode 0644
+    owner "root"
+    group "neutron"
+  end
 end

recipes/neutron-vpnaas.rb

@@ -50,6 +50,14 @@
   )
 end
 
+# Create our root wrap directory
+directory "/etc/neutron/rootwrap.d" do
+  action :create
+  owner "root"
+  group "neutron"
+  mode "755"
+end
+
 cookbook_file "/etc/neutron/rootwrap.d/vpnaas.filters" do
   source "vpnaas.filters"
   owner "root"

templates/default/neutron.conf.erb

@@ -2,6 +2,8 @@
 root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
 debug = <%= @neutron_debug %>
 verbose = <%= @neutron_verbose %>
+lock_path = $state_path/lock
+
 bind_host = <%= @neutron_ipaddress %>
 bind_port = <%= @neutron_port %>
 <% if @neutron_plugin == "ovs" %>
@@ -41,6 +43,11 @@ agent_down_time = <%= @agent_down_time %>
 network_auto_schedule = False
 router_auto_schedule = False
 
+[database]
+max_pool_size = <%= @sql_max_pool_size %>
+max_overflow = <%= @sql_max_overflow %>
+pool_timeout = <%= @sql_pool_timeout %>
+
 [AGENT]
 root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
 polling_interval = 2