Remove last references to python-keystoneclient
Remove the remaining references to python-keystoneclient, also removing it from the requirements.txt. Change-Id: I434d5366848d3010ac12a3fa12fcf86abb405fd5
This commit is contained in:
parent
9cf54118d8
commit
62aebc494e
|
@ -11,7 +11,6 @@ paramiko>=1.13.0
|
|||
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
|
||||
|
|
|
@ -1199,7 +1199,6 @@ class TempestConfigProxy(object):
|
|||
_path = None
|
||||
|
||||
_extra_log_defaults = [
|
||||
('keystoneclient.session', std_logging.INFO),
|
||||
('paramiko.transport', std_logging.INFO),
|
||||
('requests.packages.urllib3.connectionpool', std_logging.WARN),
|
||||
]
|
||||
|
|
|
@ -23,7 +23,6 @@ import boto
|
|||
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 @@ def decision_maker():
|
|||
|
||||
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 @@ def decision_maker():
|
|||
_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)
|
||||
|
|
Loading…
Reference in New Issue