From 7596c0c2ffcbd246acc6ebba61202998c3628c49 Mon Sep 17 00:00:00 2001
From: SamSu <sam.su@huawei.com>
Date: Tue, 8 Apr 2014 19:24:49 -0700
Subject: [PATCH] adjust several parameters for nova and quantum performance

Change-Id: I13f8342e8d05ee18891b4e8369824af1f12088a5
---
 .../openstack-common/recipes/databag.rb        | 18 ++++++++++++++++++
 .../templates/default/nova.conf.erb            | 11 +++++++++--
 .../templates/default/quantum.conf.erb         | 14 +++++++-------
 chef/databags/openstack/openstack.json         |  6 +++++-
 4 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/chef/cookbooks/openstack-common/recipes/databag.rb b/chef/cookbooks/openstack-common/recipes/databag.rb
index 6a09a8b..9444ffe 100644
--- a/chef/cookbooks/openstack-common/recipes/databag.rb
+++ b/chef/cookbooks/openstack-common/recipes/databag.rb
@@ -43,6 +43,24 @@ node.override['openstack']['developer_mode'] = mydata['credential']['text']
 # The coordinated release of OpenStack codename
 node.override['openstack']['release'] = mydata['release']
 
+verbose = mydata['debugging']['verbose']
+if verbose.eql?("True")
+  node.override["openstack"]["block-storage"]["verbose"] = verbose
+  node.override["openstack"]["image"]["verbose"] = verbose
+  node.override["openstack"]["identity"]["verbose"] = verbose
+  node.override["openstack"]["compute"]["verbose"] = verbose
+  node.override["openstack"]["network"]["verbose"] = verbose
+end
+
+debug = mydata['debugging']['debug']
+if debug.eql?("True")
+  node.override["openstack"]["block-storage"]["debug"] = debug
+  node.override["openstack"]["image"]["debug"] = debug
+  node.override["openstack"]["identity"]["debug"] = debug
+  node.override["openstack"]["compute"]["debug"] = debug
+  node.override["openstack"]["network"]["debug"] = debug
+end
+
 # Openstack repo setup
 # ubuntu
 node.override['openstack']['apt']['components'] = [ "precise-updates/#{node['openstack']['release']}", "main" ]
diff --git a/chef/cookbooks/openstack-compute/templates/default/nova.conf.erb b/chef/cookbooks/openstack-compute/templates/default/nova.conf.erb
index bf3f545..6220d20 100644
--- a/chef/cookbooks/openstack-compute/templates/default/nova.conf.erb
+++ b/chef/cookbooks/openstack-compute/templates/default/nova.conf.erb
@@ -25,6 +25,13 @@ rabbit_ha_queues=True
 rabbit_host=<%= node['openstack']['mq']['bind_address'] %>
 rabbit_port=<%= node['openstack']['mq']['port'] %>
 <% end -%>
+# Seconds to wait before a cast expires (TTL). Only supported
+# by impl_zmq. (integer value)
+rpc_cast_timeout=300
+# Seconds to wait for a response from a call. (integer value)
+rpc_response_timeout=300
+# Size of RPC connection pool. (integer value)
+rpc_conn_pool_size=100
 
 ##### SCHEDULER #####
 # scheduler_manager=nova.scheduler.manager.SchedulerManager
@@ -97,8 +104,8 @@ glance_api_servers=<%= @glance_api_ipaddress %>:<%= @glance_api_port %>
 compute_driver=<%= node["openstack"]["compute"]["driver"] %>
 compute_manager=nova.compute.manager.ComputeManager
 sql_connection=<%= @sql_connection %>
-sql_max_pool_size=30
-sql_max_overflow=30
+sql_max_pool_size=100
+sql_max_overflow=100
 connection_type=libvirt
 libvirt_inject_password=True
 libvirt_type=<%= node["openstack"]["compute"]["libvirt"]["virt_type"] %>
diff --git a/chef/cookbooks/openstack-network/templates/default/quantum.conf.erb b/chef/cookbooks/openstack-network/templates/default/quantum.conf.erb
index 19fafe7..a0a1ba7 100644
--- a/chef/cookbooks/openstack-network/templates/default/quantum.conf.erb
+++ b/chef/cookbooks/openstack-network/templates/default/quantum.conf.erb
@@ -270,25 +270,25 @@ agent_down_time = 10
 
 [QUOTAS]
 # resource name(s) that are supported in quota features
-# quota_items = network,subnet,port
+quota_items = network,subnet,port
 
 # default number of resource allowed per tenant, minus for unlimited
-# default_quota = -1
+default_quota = -1
 
 # number of networks allowed per tenant, and minus means unlimited
-# quota_network = 10
+quota_network = 100
 
 # number of subnets allowed per tenant, and minus means unlimited
-# quota_subnet = 10
+quota_subnet = 100
 
 # number of ports allowed per tenant, and minus means unlimited
-# quota_port = 50
+quota_port = 1000
 
 # number of security groups allowed per tenant, and minus means unlimited
-# quota_security_group = 10
+quota_security_group = 100
 
 # number of security group rules allowed per tenant, and minus means unlimited
-# quota_security_group_rule = 100
+quota_security_group_rule = 200
 
 # default driver to use for quota checks
 # quota_driver = quantum.quota.ConfDriver
diff --git a/chef/databags/openstack/openstack.json b/chef/databags/openstack/openstack.json
index 4d5d222..56da5dc 100644
--- a/chef/databags/openstack/openstack.json
+++ b/chef/databags/openstack/openstack.json
@@ -319,5 +319,9 @@
       "volume" : { "name" : "cinder",
           "status" : "enable"
         }
-    }
+    },
+  "debugging": {
+    "debug": "False",
+    "verbose": "False"
+  }
 }