From: Dirk Mueller <dirk@dmllr.de>
Date: Thu, 17 Apr 2014 13:33:07 +0000 (+0200)
Subject: Adjust sample config for keystoneclient 0.8.0 release
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=58492f491e0b774a7414c684a76db6aac1de9dcb;p=openstack-build%2Fcinder-build.git

Adjust sample config for keystoneclient 0.8.0 release

Helps fixing the gate again.

Change-Id: Ic962613fd7ee3e978890c25f911f509e9533ef8a
(cherry picked from commit da2dbd35de752d4dd47859c8b9197b00c53dd872)
---

diff --git a/etc/cinder/cinder.conf.sample b/etc/cinder/cinder.conf.sample
index b0b6b6e44..380db9937 100644
--- a/etc/cinder/cinder.conf.sample
+++ b/etc/cinder/cinder.conf.sample
@@ -1996,24 +1996,30 @@
 # Options defined in keystoneclient.middleware.auth_token
 #
 
-# Prefix to prepend at the beginning of the path (string
-# value)
+# Prefix to prepend at the beginning of the path. Deprecated,
+# use identity_uri. (string value)
 #auth_admin_prefix=
 
-# Host providing the admin Identity API endpoint (string
-# value)
+# Host providing the admin Identity API endpoint. Deprecated,
+# use identity_uri. (string value)
 #auth_host=127.0.0.1
 
-# Port of the admin Identity API endpoint (integer value)
+# Port of the admin Identity API endpoint. Deprecated, use
+# identity_uri. (integer value)
 #auth_port=35357
 
-# Protocol of the admin Identity API endpoint(http or https)
-# (string value)
+# Protocol of the admin Identity API endpoint (http or https).
+# Deprecated, use identity_uri. (string value)
 #auth_protocol=https
 
 # Complete public Identity API endpoint (string value)
 #auth_uri=<None>
 
+# Complete admin Identity API endpoint. This should specify
+# the unversioned root endpoint eg. https://localhost:35357/
+# (string value)
+#identity_uri=<None>
+
 # API version of the admin Identity API endpoint (string
 # value)
 #auth_version=<None>