openstack/keystoneauth
Code Issues Proposed changes

Move admin_token to base _plugins dir

Browse Source 
The admin_token isn't an identity plugin. Put it in base _plugins dir.
This won't affect loading.

Change-Id: I5e8935dafe3dcc01bf8f4f5cf08ab2b7404c5acc
This commit is contained in:
Jamie Lennox 2015-08-31 15:10:39 +10:00
parent dcea6b89ee
commit 0505180d1f
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
keystoneauth1/loading/_plugins/identity/admin_token.py → keystoneauth1/loading/_plugins/admin_token.py
View File

2
keystoneauth1/tests/unit/auth/test_token_endpoint.py
View File

@ -12,7 +12,7 @@
from testtools import matchers from testtools import matchers
from keystoneauth1.loading._plugins.identity import admin_token as loader from keystoneauth1.loading._plugins import admin_token as loader
from keystoneauth1 import session from keystoneauth1 import session
from keystoneauth1.tests.unit import utils from keystoneauth1.tests.unit import utils
from keystoneauth1 import token_endpoint from keystoneauth1 import token_endpoint

2
setup.cfg
View File

@ -28,7 +28,7 @@ packages =
keystoneauth1.plugin = keystoneauth1.plugin =
password = keystoneauth1.loading._plugins.identity.generic:Password password = keystoneauth1.loading._plugins.identity.generic:Password
token = keystoneauth1.loading._plugins.identity.generic:Token token = keystoneauth1.loading._plugins.identity.generic:Token
admin_token = keystoneauth1.loading._plugins.identity.admin_token:AdminToken admin_token = keystoneauth1.loading._plugins.admin_token:AdminToken
v2password = keystoneauth1.loading._plugins.identity.v2:Password v2password = keystoneauth1.loading._plugins.identity.v2:Password
v2token = keystoneauth1.loading._plugins.identity.v2:Token v2token = keystoneauth1.loading._plugins.identity.v2:Token
v3password = keystoneauth1.loading._plugins.identity.v3:Password v3password = keystoneauth1.loading._plugins.identity.v3:Password