From da2dbd35de752d4dd47859c8b9197b00c53dd872 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 17 Apr 2014 15:33:07 +0200 Subject: [PATCH] Adjust sample config for keystoneclient 0.8.0 release Helps fixing the gate again. Change-Id: Ic962613fd7ee3e978890c25f911f509e9533ef8a --- etc/cinder/cinder.conf.sample | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/etc/cinder/cinder.conf.sample b/etc/cinder/cinder.conf.sample index ce682a4c685..d0f4eb55cc5 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= +# Complete admin Identity API endpoint. This should specify +# the unversioned root endpoint eg. https://localhost:35357/ +# (string value) +#identity_uri= + # API version of the admin Identity API endpoint (string # value) #auth_version=