Merge pull request #27 from retr0h/working

Integrated keystone with opentack-common's PKI toggling

README.md

@@ -69,6 +69,7 @@ Attributes
 * `cinder["volume"]["volume_driver"]` - Driver to use for volume creation
 * `cinder["volume"]["volume_group"]` - Name for the VG that will contain exported volumes
 * `cinder["volume"]["iscsi_helper"]` - ISCSI target user-land tool to use
+* `cinder["pki"]["signing_dir"]` - Defaults to `/tmp/cinder-signing-dir`.  Directory where `auth_token` middleware writes certificate
 
 Templates
 =====

attributes/default.rb

@@ -46,6 +46,10 @@ default["cinder"]["keystone_service_chef_role"] = "keystone"
 # This is the name of the Chef role that will install the Glance API
 default["cinder"]["glance_api_chef_role"] = "glance-api"
 
+# Controls for the PKI options in the auth_token middleware
+# that is in the paste INI files.
+default["cinder"]["pki"]["signing_dir"] = "/tmp/cinder-signing-dir"
+
 # operating system group name
 default["cinder"]["group"] = "cinder"
 # operating system user that services will run under

templates/default/api-paste.ini.erb

@@ -51,4 +51,6 @@ auth_protocol = <%= @identity_admin_endpoint.scheme %>
 admin_tenant_name = <%= node["cinder"]["service_tenant_name"] %>
 admin_user = <%= node["cinder"]["service_user"] %>
 admin_password = <%= @service_pass %>
-signing_dir = /var/lib/cinder
+<% if node["openstack"]["auth"]["strategy"] == "pki" -%>
+signing_dir = <%= node["cinder"]["pki"]["signing_dir"] %>
+<% end -%>