Merge "Adjust server configs"
diff --git a/neutron/files/mitaka/neutron-generic.conf.Debian b/neutron/files/mitaka/neutron-generic.conf.Debian
index aaa8397..092fd56 100644
--- a/neutron/files/mitaka/neutron-generic.conf.Debian
+++ b/neutron/files/mitaka/neutron-generic.conf.Debian
@@ -518,7 +518,7 @@
# Seconds to wait for a response from a call. (integer value)
#rpc_response_timeout = 60
-rpc_response_timeout=60
+rpc_response_timeout=120
# A URL representing the messaging driver to use and its full configuration. If
# not set, we fall back to the rpc_backend option and driver specific
diff --git a/neutron/files/mitaka/neutron-server.conf.Debian b/neutron/files/mitaka/neutron-server.conf.Debian
index 2176b40..c75d6a3 100644
--- a/neutron/files/mitaka/neutron-server.conf.Debian
+++ b/neutron/files/mitaka/neutron-server.conf.Debian
@@ -222,6 +222,7 @@
# Number of RPC worker processes dedicated to state reports queue (integer
# value)
#rpc_state_report_workers = 1
+rpc_state_report_workers = 4
# Range of seconds to randomly delay when starting the periodic task scheduler
# to reduce stampeding. (Disable by setting to 0) (integer value)
@@ -333,6 +334,7 @@
# Automatically reschedule routers from offline L3 agents to online L3 agents.
# (boolean value)
#allow_automatic_l3agent_failover = false
+allow_automatic_l3agent_failover = true
# Enable HA mode for virtual routers. (boolean value)
#l3_ha = false
@@ -341,6 +343,7 @@
# Maximum number of L3 agents which a HA router will be scheduled on. If it is
# set to 0 then the router will be scheduled on every agent. (integer value)
#max_l3_agents_per_router = 3
+max_l3_agents_per_router = 0
# Minimum number of L3 agents which a HA router will be scheduled on. If it is
# set to 0 then the router will be scheduled on every agent. (integer value)
@@ -542,7 +545,7 @@
# Seconds to wait for a response from a call. (integer value)
#rpc_response_timeout = 60
-rpc_response_timeout=60
+rpc_response_timeout=120
# A URL representing the messaging driver to use and its full configuration. If
# not set, we fall back to the rpc_backend option and driver specific
@@ -776,7 +779,7 @@
# Deprecated group/name - [DEFAULT]/sql_max_pool_size
# Deprecated group/name - [DATABASE]/sql_max_pool_size
#max_pool_size = <None>
-max_pool_size = 20
+max_pool_size = {{ [grains.num_cpus * 5, 30] | sort | first }}
# Maximum number of database connection retries during startup. Set to -1 to
# specify an infinite retry count. (integer value)
diff --git a/neutron/files/newton/neutron-generic.conf.Debian b/neutron/files/newton/neutron-generic.conf.Debian
index 4ab3d2b..8c39aa6 100644
--- a/neutron/files/newton/neutron-generic.conf.Debian
+++ b/neutron/files/newton/neutron-generic.conf.Debian
@@ -518,7 +518,7 @@
# Seconds to wait for a response from a call. (integer value)
#rpc_response_timeout = 60
-rpc_response_timeout=60
+rpc_response_timeout=120
# A URL representing the messaging driver to use and its full configuration. If
# not set, we fall back to the rpc_backend option and driver specific
diff --git a/neutron/files/newton/neutron-server.conf.Debian b/neutron/files/newton/neutron-server.conf.Debian
index 76a0d49..2aacbe3 100644
--- a/neutron/files/newton/neutron-server.conf.Debian
+++ b/neutron/files/newton/neutron-server.conf.Debian
@@ -222,6 +222,7 @@
# Number of RPC worker processes dedicated to state reports queue (integer
# value)
#rpc_state_report_workers = 1
+rpc_state_report_workers = 4
# Range of seconds to randomly delay when starting the periodic task scheduler
# to reduce stampeding. (Disable by setting to 0) (integer value)
@@ -333,6 +334,7 @@
# Automatically reschedule routers from offline L3 agents to online L3 agents.
# (boolean value)
#allow_automatic_l3agent_failover = false
+allow_automatic_l3agent_failover = true
# Enable HA mode for virtual routers. (boolean value)
#l3_ha = false
@@ -341,6 +343,7 @@
# Maximum number of L3 agents which a HA router will be scheduled on. If it is
# set to 0 then the router will be scheduled on every agent. (integer value)
#max_l3_agents_per_router = 3
+max_l3_agents_per_router = 0
# Minimum number of L3 agents which a HA router will be scheduled on. If it is
# set to 0 then the router will be scheduled on every agent. (integer value)
@@ -542,7 +545,7 @@
# Seconds to wait for a response from a call. (integer value)
#rpc_response_timeout = 60
-rpc_response_timeout=60
+rpc_response_timeout=120
# A URL representing the messaging driver to use and its full configuration. If
# not set, we fall back to the rpc_backend option and driver specific
@@ -785,7 +788,7 @@
# Deprecated group/name - [DEFAULT]/sql_max_pool_size
# Deprecated group/name - [DATABASE]/sql_max_pool_size
#max_pool_size = <None>
-max_pool_size = 20
+max_pool_size = {{ [grains.num_cpus * 5, 30] | sort | first }}
# Maximum number of database connection retries during startup. Set to -1 to
# specify an infinite retry count. (integer value)
diff --git a/neutron/files/ocata/neutron-generic.conf.Debian b/neutron/files/ocata/neutron-generic.conf.Debian
index 2da5745..0dde78f 100644
--- a/neutron/files/ocata/neutron-generic.conf.Debian
+++ b/neutron/files/ocata/neutron-generic.conf.Debian
@@ -584,7 +584,7 @@
# Seconds to wait for a response from a call. (integer value)
#rpc_response_timeout = 60
-rpc_response_timeout=60
+rpc_response_timeout=120
# A URL representing the messaging driver to use and its full configuration.
# (string value)
diff --git a/neutron/files/ocata/neutron-server.conf.Debian b/neutron/files/ocata/neutron-server.conf.Debian
index afcae32..229d342 100644
--- a/neutron/files/ocata/neutron-server.conf.Debian
+++ b/neutron/files/ocata/neutron-server.conf.Debian
@@ -184,6 +184,7 @@
# Number of RPC worker processes dedicated to state reports queue. (integer
# value)
#rpc_state_report_workers = 1
+rpc_state_report_workers = 4
# Range of seconds to randomly delay when starting the periodic task scheduler
# to reduce stampeding. (Disable by setting to 0) (integer value)
@@ -290,6 +291,7 @@
# Automatically reschedule routers from offline L3 agents to online L3 agents.
# (boolean value)
#allow_automatic_l3agent_failover = false
+allow_automatic_l3agent_failover = true
# Enable HA mode for virtual routers. (boolean value)
#l3_ha = false
@@ -298,6 +300,7 @@
# Maximum number of L3 agents which a HA router will be scheduled on. If it is
# set to 0 then the router will be scheduled on every agent. (integer value)
#max_l3_agents_per_router = 3
+max_l3_agents_per_router = 0
# Subnet used for the l3 HA admin network. (string value)
#l3_ha_net_cidr = 169.254.192.0/18
@@ -605,7 +608,7 @@
# Seconds to wait for a response from a call. (integer value)
#rpc_response_timeout = 60
-rpc_response_timeout=60
+rpc_response_timeout=120
# A URL representing the messaging driver to use and its full configuration.
# (string value)
@@ -864,7 +867,7 @@
# Deprecated group/name - [DEFAULT]/sql_max_pool_size
# Deprecated group/name - [DATABASE]/sql_max_pool_size
#max_pool_size = 5
-max_pool_size = 20
+max_pool_size = {{ [grains.num_cpus * 5, 30] | sort | first }}
# Maximum number of database connection retries during startup. Set to -1 to
# specify an infinite retry count. (integer value)