From def28347e99c26caad90659e9882f859ef98d516 Mon Sep 17 00:00:00 2001
From: "ChangBo Guo(gcb)" <eric.guo@easystack.cn>
Date: Sun, 30 Apr 2017 21:08:25 +0800
Subject: [PATCH] Fix test keystone.tests.unit.test_token_bind.BindTest

[token] enforce_token_bind option was deprecated for removal, and
the 'bind' option doesn't enforce a set of choices. I think the better
option here would be to remove the choices field and let the backend
enforce correctness.

Partial-Bug: #1686921
Change-Id: If0a537237a477303c0ce84945d83ce440f4d7812
---
 keystone/conf/token.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/keystone/conf/token.py b/keystone/conf/token.py
index cb937cd048..384089ea5d 100644
--- a/keystone/conf/token.py
+++ b/keystone/conf/token.py
@@ -30,7 +30,6 @@ enforced according to the `[token] enforce_token_bind` option.
 enforce_token_bind = cfg.StrOpt(
     'enforce_token_bind',
     default='permissive',
-    choices=['disabled', 'permissive', 'strict', 'required'],
     deprecated_since=versionutils.deprecated.PIKE,
     deprecated_for_removal=True,
     help=utils.fmt("""