From: Eric Harney <eharney@redhat.com>
Date: Mon, 13 Jan 2014 17:19:12 +0000 (-0500)
Subject: Update cinder.conf.sample for keystoneclient change
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=6f1e6f473c84657b33dde094cb4b047fbdaf7c45;p=openstack-build%2Fcinder-build.git

Update cinder.conf.sample for keystoneclient change

A new version of python-keystoneclient adds the
"include_service_catalog" option, so the sample conf needs to be
updated.

Closes-Bug: #1268614

Change-Id: Ie6913e481caf61ee517c1c101565401fe33c60d6
---

diff --git a/etc/cinder/cinder.conf.sample b/etc/cinder/cinder.conf.sample
index 3caf3eeac..967cd7bc8 100644
--- a/etc/cinder/cinder.conf.sample
+++ b/etc/cinder/cinder.conf.sample
@@ -1970,6 +1970,12 @@
 # value)
 #memcache_secret_key=<None>
 
+# (optional) indicate whether to set the X-Service-Catalog
+# header. If False, middleware will not ask for service
+# catalog on token validation and will not set the X-Service-
+# Catalog header. (boolean value)
+#include_service_catalog=true
+
 
 [matchmaker_ring]