From a326493ad9b2a10329a312658d27a607fc898614 Mon Sep 17 00:00:00 2001 From: Adam Harwell Date: Tue, 15 Dec 2015 16:31:59 -0800 Subject: [PATCH] Use keystoneauth to prevent logging sensitive data Change-Id: I00e260a28d043a27fb335ee8d8030b3c515bda9e Closes-Bug: #1524675 --- neutron_lbaas/common/keystone.py | 6 +++--- requirements.txt | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/neutron_lbaas/common/keystone.py b/neutron_lbaas/common/keystone.py index 31a548e07..6240e47ed 100644 --- a/neutron_lbaas/common/keystone.py +++ b/neutron_lbaas/common/keystone.py @@ -12,9 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. -from keystoneclient.auth.identity import v2 as v2_client -from keystoneclient.auth.identity import v3 as v3_client -from keystoneclient import session +from keystoneauth1.identity import v2 as v2_client +from keystoneauth1.identity import v3 as v3_client +from keystoneauth1 import session from oslo_config import cfg from oslo_log import log as logging from oslo_utils import excutils diff --git a/requirements.txt b/requirements.txt index 55410bb47..eef966231 100644 --- a/requirements.txt +++ b/requirements.txt @@ -21,3 +21,4 @@ pyasn1 pyasn1-modules pyOpenSSL>=0.14 stevedore>=1.5.0 # Apache-2.0 +keystoneauth1>=2.1.0