diff --git a/chef/cookbooks/cinder/templates/default/cinder.conf.erb b/chef/cookbooks/cinder/templates/default/cinder.conf.erb index 3b926a91c6..12ec64bd04 100644 --- a/chef/cookbooks/cinder/templates/default/cinder.conf.erb +++ b/chef/cookbooks/cinder/templates/default/cinder.conf.erb @@ -7,7 +7,6 @@ transport_url = <%= @rabbit_settings[:url] %> rpc_response_timeout = <%= node[:cinder][:rpc_response_timeout] %> control_exchange = cinder max_header_line = <%= node[:cinder][:max_header_line] %> -wsgi_keep_alive = false state_path = /var/lib/cinder my_ip = <%= node[:cinder][:my_ip] %> diff --git a/chef/cookbooks/heat/templates/default/heat.conf.erb b/chef/cookbooks/heat/templates/default/heat.conf.erb index 184e7bf532..88e05a5b69 100644 --- a/chef/cookbooks/heat/templates/default/heat.conf.erb +++ b/chef/cookbooks/heat/templates/default/heat.conf.erb @@ -78,9 +78,6 @@ insecure = <%= @keystone_settings['insecure'] %> [database] connection = <%= @database_connection %> -[eventlet_opts] -wsgi_keep_alive = false - [heat_api] bind_host = <%= @bind_host %> bind_port = <%= @api_port %> diff --git a/chef/cookbooks/manila/templates/default/manila.conf.erb b/chef/cookbooks/manila/templates/default/manila.conf.erb index a34a03118a..8d9a5befcc 100644 --- a/chef/cookbooks/manila/templates/default/manila.conf.erb +++ b/chef/cookbooks/manila/templates/default/manila.conf.erb @@ -15,7 +15,6 @@ osapi_share_listen=<%= @bind_host %> osapi_share_listen_port=<%= @bind_port %> osapi_share_workers=<%= [node["cpu"]["total"], 2, 4].sort[1] %> max_header_line = <%= node[:manila][:max_header_line] %> -wsgi_keep_alive = false ssl_ca_file=<%= node[:manila][:ssl][:ca_certs] if node[:manila][:api][:protocol] == 'https' && node[:manila][:ssl][:cert_required] %> ssl_cert_file=<%= node[:manila][:ssl][:certfile] if node[:manila][:api][:protocol] == 'https' %> ssl_key_file=<%= node[:manila][:ssl][:keyfile] if node[:manila][:api][:protocol] == 'https' %> diff --git a/chef/cookbooks/neutron/templates/default/neutron.conf.erb b/chef/cookbooks/neutron/templates/default/neutron.conf.erb index 12603aae2d..37869c9e27 100644 --- a/chef/cookbooks/neutron/templates/default/neutron.conf.erb +++ b/chef/cookbooks/neutron/templates/default/neutron.conf.erb @@ -24,7 +24,6 @@ use_stderr = false transport_url = <%= @rabbit_settings[:url] %> control_exchange = neutron max_header_line = <%= node[:neutron][:max_header_line] %> -wsgi_keep_alive = false <% unless @default_log_levels.length.zero? -%> default_log_levels = <%= @default_log_levels.join(", ") %> <% end -%> diff --git a/chef/cookbooks/nova/templates/default/nova.conf.erb b/chef/cookbooks/nova/templates/default/nova.conf.erb index e14208c534..efb5dc271b 100644 --- a/chef/cookbooks/nova/templates/default/nova.conf.erb +++ b/chef/cookbooks/nova/templates/default/nova.conf.erb @@ -329,7 +329,6 @@ xvpvncproxy_host = <%= @bind_host %> max_header_line = <%= node[:nova][:max_header_line] %> ssl_cert_file = <%= @ssl_cert_file %> ssl_key_file = <%= @ssl_key_file %> -keep_alive = false [upgrade_levels] # Determine RPC protocol version for nova based on the minimum diff --git a/chef/cookbooks/sahara/templates/default/sahara.conf.erb b/chef/cookbooks/sahara/templates/default/sahara.conf.erb index 55aeba55a0..2638060a46 100644 --- a/chef/cookbooks/sahara/templates/default/sahara.conf.erb +++ b/chef/cookbooks/sahara/templates/default/sahara.conf.erb @@ -3,7 +3,6 @@ debug = <%= node[:sahara][:debug] %> log_dir = /var/log/sahara transport_url = <%= @rabbit_settings[:url] %> use_syslog=<%= node[:sahara][:use_syslog] ? "True" : "False" %> -wsgi_keep_alive = false host = <%= @bind_host %> port = <%= @bind_port %> use_namespaces = true