commit 62aebc494ef1d65af39a89eccc1419139ab1c8e0
author Attila Fazekas <afazekas@redhat.com> Thu Mar 12 07:38:19 2015 +0100
committer Attila Fazekas <afazekas@redhat.com> Mon Mar 16 12:37:39 2015 +0100
tree 9ed828eb72ff2d908d0c2c122e0aad9a25323d44
parent 9cf54118d857c6d725b00641114163fd0b3a83db

Remove last references to python-keystoneclient

Remove the remaining references to python-keystoneclient,
also removing it from the requirements.txt.

Change-Id: I434d5366848d3010ac12a3fa12fcf86abb405fd5

requirements.txt

diff --git a/requirements.txt b/requirements.txt
index 56796d8..e6fc09b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,6 @@
 netaddr>=0.7.12
 python-ceilometerclient>=1.0.6
 python-glanceclient>=0.15.0
-python-keystoneclient>=1.1.0
 python-cinderclient>=1.1.0
 python-heatclient>=0.3.0
 python-ironicclient>=0.2.1

tempest/config.py

diff --git a/tempest/config.py b/tempest/config.py
index c459d76..a127194 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -1199,7 +1199,6 @@
     _path = None
 
     _extra_log_defaults = [
-        ('keystoneclient.session', std_logging.INFO),
         ('paramiko.transport', std_logging.INFO),
         ('requests.packages.urllib3.connectionpool', std_logging.WARN),
     ]

tempest/thirdparty/boto/test.py

diff --git a/tempest/thirdparty/boto/test.py b/tempest/thirdparty/boto/test.py
index 90d0838..3f7bb7d 100644
--- a/tempest/thirdparty/boto/test.py
+++ b/tempest/thirdparty/boto/test.py
@@ -23,7 +23,6 @@
 from boto import ec2
 from boto import exception
 from boto import s3
-import keystoneclient.exceptions
 from oslo_log import log as logging
 import six
 
@@ -83,7 +82,7 @@
 
     except lib_exc.Unauthorized:
         EC2_CAN_CONNECT_ERROR = "AWS credentials not set," +\
-                                " failed to get them even by keystoneclient"
+                                " also failed to get it from keystone"
     except Exception as exc:
         EC2_CAN_CONNECT_ERROR = str(exc)
 
@@ -98,7 +97,7 @@
                 _cred_sub_check(s3client.connection_data)
     except Exception as exc:
         S3_CAN_CONNECT_ERROR = str(exc)
-    except keystoneclient.exceptions.Unauthorized:
+    except lib_exc.Unauthorized:
         S3_CAN_CONNECT_ERROR = "AWS credentials not set," +\
                                " failed to get them even by keystoneclient"
     boto_logger.logger.setLevel(level)