From fd449f1b34db95c1bcc2d204aeb6e5604dce927c Mon Sep 17 00:00:00 2001
From: Marc Koderer <marc@koderer.com>
Date: Mon, 7 Mar 2016 12:29:49 +0100
Subject: [PATCH] Fix manila devstack plugin for keystone v3 usage
A devstack run with a keystone v3 only setup (ENABLE_IDENTITY_V2=False)
fails currently.
Partial-bug: #1553082
Change-Id: Ie8885d2c2f4d82d9894f4ca233153184125c20f2
---
devstack/plugin.sh | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index aec050b17a..b091222ba4 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -171,11 +171,7 @@ function configure_manila {
# Remove old conf file if exists
rm -f $MANILA_CONF
- iniset $MANILA_CONF keystone_authtoken identity_uri $KEYSTONE_AUTH_URI
- iniset $MANILA_CONF keystone_authtoken admin_tenant_name $SERVICE_PROJECT_NAME
- iniset $MANILA_CONF keystone_authtoken admin_user manila
- iniset $MANILA_CONF keystone_authtoken admin_password $SERVICE_PASSWORD
- iniset $MANILA_CONF keystone_authtoken signing_dir $MANILA_AUTH_CACHE_DIR
+ configure_auth_token_middleware $MANILA_CONF manila $MANILA_AUTH_CACHE_DIR
iniset $MANILA_CONF DEFAULT auth_strategy keystone
iniset $MANILA_CONF DEFAULT debug True