diff options
| author | Zuul <zuul@review.openstack.org> | 2018-10-15 00:45:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-10-15 00:45:12 +0000 |
| commit | 3881e0ba34cb3a088bda81ca825f844b8bbf4785 (patch) | |
| tree | 793525b3b60818deff4ef23724b56f959b987a45 | |
| parent | 0fdb154d9c094a4316c7f216dd6ee957287cd54c (diff) | |
| parent | 05e287fa9f131d51e19e09ac3f3bfde20a9dc0d4 (diff) | |
| download | python-novaclient-3881e0ba34cb3a088bda81ca825f844b8bbf4785.tar.gz | |
Merge "Enable split logging for cinder-novaclient interaction"
| -rw-r--r-- | lower-constraints.txt | 2 | ||||
| -rw-r--r-- | novaclient/v2/client.py | 2 | ||||
| -rw-r--r-- | requirements.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lower-constraints.txt b/lower-constraints.txt index 4f156569..5d9d5197 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -34,7 +34,7 @@ jsonpatch==1.16 jsonpointer==1.13 jsonschema==2.6.0 keyring==5.5.1 -keystoneauth1==3.4.0 +keystoneauth1==3.5.0 kombu==4.0.0 linecache2==1.0.0 MarkupSafe==1.0 diff --git a/novaclient/v2/client.py b/novaclient/v2/client.py index bc66575f..ee4fc345 100644 --- a/novaclient/v2/client.py +++ b/novaclient/v2/client.py @@ -206,7 +206,7 @@ class Client(object): endpoint_type=endpoint_type, http_log_debug=http_log_debug, insecure=insecure, - logger=self.logger, + logger=logger, os_cache=self.os_cache, password=password, project_domain_id=project_domain_id, diff --git a/requirements.txt b/requirements.txt index 9ac07a62..9371e327 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. pbr!=2.1.0,>=2.0.0 # Apache-2.0 -keystoneauth1>=3.4.0 # Apache-2.0 +keystoneauth1>=3.5.0 # Apache-2.0 iso8601>=0.1.11 # MIT oslo.i18n>=3.15.3 # Apache-2.0 oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0 |