From: Jay S Bryant <jsbryant@us.ibm.com>
Date: Fri, 2 Oct 2015 17:44:13 +0000 (-0500)
Subject: Remove unused 'deprecated' option from auth_strategy opt
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=604112253172bfaa0b3a786df8c023914dc2a289;p=openstack-build%2Fcinder-build.git

Remove unused 'deprecated' option from auth_strategy opt

Noticed that the auth_strategy option in
cinder/common/config.py has a 'deprecated' option.  I
can only see that 'no_auth' and 'keystone' are used anywhere
in the code.  Looking at the git logs it appears that
the 'deprecated' option may have been pulled over when we split
from Nova.  This patch removes the unused option.

DocImpact

Change-Id: I34383f9ceb87d10030e1c28f4bc0a7d8c21467d4
---

diff --git a/cinder/common/config.py b/cinder/common/config.py
index f7314f70d..de45905fa 100644
--- a/cinder/common/config.py
+++ b/cinder/common/config.py
@@ -175,9 +175,8 @@ global_opts = [
                help='The full class name of the volume backup API class'),
     cfg.StrOpt('auth_strategy',
                default='keystone',
-               choices=['noauth', 'keystone', 'deprecated'],
-               help='The strategy to use for auth. Supports noauth, keystone, '
-                    'and deprecated.'),
+               choices=['noauth', 'keystone'],
+               help='The strategy to use for auth. Supports noauth or keystone.'),
     cfg.ListOpt('enabled_backends',
                 default=None,
                 help='A list of backend names to use. These backend names '