From 0e3117cb01d201f403be72cbb1218b9eec69a541 Mon Sep 17 00:00:00 2001
From: lifeless <robertc@robertcollins.net>
Date: Thu, 13 Aug 2015 07:09:22 +0000
Subject: Revert "Use the correct auth_plugin for token authentication"

This reverts commit dfef01a7cbb9d68ad443d182e548ec58143a3a1f.

This broke the world.

Change-Id: I65d820b0da807a161eae814ea4b5413f245d7bf0
---
 os_client_config/config.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/os_client_config/config.py b/os_client_config/config.py
index 240220a..1840d18 100644
--- a/os_client_config/config.py
+++ b/os_client_config/config.py
@@ -379,12 +379,8 @@ class OpenStackConfig(object):
 
     def _validate_auth(self, config):
         # May throw a keystoneclient.exceptions.NoMatchingPlugin
-        if config['auth_type'] == 'token_endpoint':
-            auth_plugin = ksc_auth.token_endpoint.Token
-        else:
-            auth_plugin = ksc_auth.get_plugin_class(config['auth_type'])
-
-        plugin_options = auth_plugin.get_options()
+        plugin_options = ksc_auth.get_plugin_class(
+            config['auth_type']).get_options()
 
         for p_opt in plugin_options:
             # if it's in config.auth, win, kill it from config dict
-- 
cgit v1.2.1