Merge pull request #270 from dirkmueller/release/tex/master

Use direct access for rbd backed images (bsc#945043)

chef/cookbooks/cinder/recipes/common.rb

@@ -91,11 +91,13 @@
   glance_server_protocol = glance_server[:glance][:api][:protocol]
   glance_server_port = glance_server[:glance][:api][:bind_port]
   glance_server_insecure = glance_server_protocol == 'https' && glance_server[:glance][:ssl][:insecure]
+  glance_show_storage_location = glance_server[:glance][:show_storage_location]
 else
   glance_server_host = nil
   glance_server_port = nil
   glance_server_protocol = nil
   glance_server_insecure = nil
+  glance_show_storage_location = false
 end
 Chef::Log.info("Glance server at #{glance_server_host}")
 
@@ -228,6 +230,7 @@
     :glance_server_host => glance_server_host,
     :glance_server_port => glance_server_port,
     :glance_server_insecure => glance_server_insecure,
+    :show_storage_location => glance_show_storage_location,
     :nova_api_insecure => nova_api_insecure,
     :availability_zone => availability_zone,
     :keystone_settings => KeystoneHelper.keystone_settings(node, :cinder),

chef/cookbooks/cinder/templates/default/cinder.conf.erb

@@ -309,6 +309,19 @@ strict_ssh_host_key_policy=<%= @strict_ssh_host_key_policy ? 'true' : 'false' %>
 # with big service catalogs). (integer value)
 max_header_line = <%= node[:cinder][:max_header_line] %>
 
+# If False, closes the client socket connection explicitly.
+# Setting it to True to maintain backward compatibility.
+# Recommended setting is set it to False. (boolean value)
+#wsgi_keep_alive=true
+wsgi_keep_alive=false
+
+# Timeout for client connections' socket operations. If an
+# incoming connection is idle for this number of seconds it
+# will be closed. A value of '0' means wait forever. (integer
+# value)
+#client_socket_timeout=0
+client_socket_timeout=900
+
 # Sets the value of TCP_KEEPALIVE (True/False) for each server
 # socket. (boolean value)
 #tcp_keepalive=true
@@ -511,7 +524,7 @@ my_ip=<%= node[:cinder][:my_ip] %>
 glance_api_servers=<%= @glance_server_protocol %>://<%= @glance_server_host %>:<%= @glance_server_port %>
 
 # Version of the glance API to use (integer value)
-#glance_api_version=1
+glance_api_version=2
 
 # Number retries when downloading an image from glance
 # (integer value)
@@ -740,6 +753,10 @@ nova_api_insecure=<%= @nova_api_insecure %>
 # the direct_url.  Currently supported schemes: [file]. (list
 # value)
 #allowed_direct_url_schemes=
+<% if @show_storage_location -%>
+### Enable file and cinder if available
+allowed_direct_url_schemes=rbd
+<% end -%>
 
 
 #