From 48b5f8e15b869fe97fcf263daaa761400656ea2c Mon Sep 17 00:00:00 2001
From: Christian Berendt <berendt@b1-systems.de>
Date: Mon, 5 May 2014 09:09:38 +0200
Subject: [PATCH] set default auth_strategy to keystone
Like in change Ife63dc7ab680fcf0588d95c98fc9f29901485c64 for Nova
the default for auth_strategy should be keystone instead of noauth.
DocImpact Changed default config option 'auth_strategy' to 'keystone'.
Change-Id: Ia72c5bf9be641b438a4d428ba43e501d1aa333d6
Closes-Bug: #1327503
---
cinder/common/config.py | 2 +-
cinder/tests/conf_fixture.py | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/cinder/common/config.py b/cinder/common/config.py
index f6a49c7c2..cee3b518d 100644
--- a/cinder/common/config.py
+++ b/cinder/common/config.py
@@ -167,7 +167,7 @@ global_opts = [
default='cinder.backup.api.API',
help='The full class name of the volume backup API class'),
cfg.StrOpt('auth_strategy',
- default='noauth',
+ default='keystone',
choices=['noauth', 'keystone', 'deprecated'],
help='The strategy to use for auth. Supports noauth, keystone, '
'and deprecated.'),
diff --git a/cinder/tests/conf_fixture.py b/cinder/tests/conf_fixture.py
index 009928cc1..b1c4ccffc 100644
--- a/cinder/tests/conf_fixture.py
+++ b/cinder/tests/conf_fixture.py
@@ -51,3 +51,4 @@ def set_defaults(conf):
conf.set_default('state_path', os.path.abspath(
os.path.join(os.path.dirname(__file__), '..', '..')))
conf.set_default('policy_dirs', [])
+ conf.set_default('auth_strategy', 'noauth')
--
2.45.2