From 05e287fa9f131d51e19e09ac3f3bfde20a9dc0d4 Mon Sep 17 00:00:00 2001
From: openstack <neha.alhat@nttdata.com>
Date: Wed, 25 Jul 2018 17:38:57 +0530
Subject: [PATCH] Enable split logging for cinder-novaclient interaction

This patch ensures that log messages[1][2][3] are logged only when
keystoneauth=DEBUG is enabled in cinder.conf. This will also enable
us to consume split_logger config option [4] when enabled in cinder
without making any additional changes in client code.

[1] REQ: https://review.openstack.org/#/c/505764/8/keystoneauth1/session.py@391
[2] RESP: https://review.openstack.org/#/c/505764/8/keystoneauth1/session.py@422
[3] RESP BODY: https://review.openstack.org/#/c/505764/8/keystoneauth1/session.py@454
[4] https://review.openstack.org/#/c/568878/

Closes-Bug: #1782134
Change-Id:I3c47b5249141b3f05b2f54984bb5b1d7801a02bc
---
 lower-constraints.txt   | 2 +-
 novaclient/v2/client.py | 2 +-
 requirements.txt        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lower-constraints.txt b/lower-constraints.txt
index 4f156569f..5d9d5197d 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 bc66575f4..ee4fc3453 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 9ac07a62b..9371e3274 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