Merge "Use keystoneauth to prevent logging sensitive data"

octavia/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

requirements.txt

@@ -8,6 +8,7 @@ SQLAlchemy<1.1.0,>=0.9.9
 Babel>=1.3
 eventlet>=0.17.4
 requests!=2.9.0,>=2.8.1
+keystoneauth1>=2.1.0
 keystonemiddleware>=4.0.0
 python-neutronclient>=2.6.0
 WebOb>=1.2.3
@@ -27,7 +28,6 @@ oslo.service>=1.0.0 # Apache-2.0
 oslo.utils>=3.2.0 # Apache-2.0
 PyMySQL>=0.6.2 # MIT License
 python-barbicanclient>=3.3.0
-python-keystoneclient!=1.8.0,>=1.6.0
 python-novaclient!=2.33.0,>=2.29.0
 pyOpenSSL>=0.14
 WSME>=0.8