Merge remote-tracking branch 'origin/master' into merge-branchfeature/keystoneauth_integration

Conflicts:
	keystoneclient/exceptions.py
	keystoneclient/fixture/discovery.py
	keystoneclient/fixture/v2.py
	keystoneclient/fixture/v3.py
	keystoneclient/middleware/auth_token.py
	keystoneclient/middleware/s3_token.py
	keystoneclient/tests/unit/test_auth_token_middleware.py
	keystoneclient/tests/unit/test_memcache_crypt.py
	keystoneclient/tests/unit/test_s3_token_middleware.py
	requirements.txt
	test-requirements.txt

Change-Id: Ib51acebaac7966bf37c1562fa15b9061df6a7aa5

1 files changed, 22 insertions, 2 deletions

diff --git a/keystoneclient/contrib/auth/v3/oidc.py b/keystoneclient/contrib/auth/v3/oidc.py
index 6105e06..0c94519 100644
--- a/keystoneclient/contrib/auth/v3/oidc.py
+++ b/keystoneclient/contrib/auth/v3/oidc.py
@@ -87,14 +87,34 @@ class OidcPassword(federated.FederatedBaseAuth):
         """
         super(OidcPassword, self).__init__(auth_url, identity_provider,
                                            protocol)
-        self.username = username
-        self.password = password
+        self._username = username
+        self._password = password
         self.client_id = client_id
         self.client_secret = client_secret
         self.access_token_endpoint = access_token_endpoint
         self.scope = scope
         self.grant_type = grant_type
 
+    @property
+    def username(self):
+        # Override to remove deprecation.
+        return self._username
+
+    @username.setter
+    def username(self, value):
+        # Override to remove deprecation.
+        self._username = value
+
+    @property
+    def password(self):
+        # Override to remove deprecation.
+        return self._password
+
+    @password.setter
+    def password(self, value):
+        # Override to remove deprecation.
+        self._password = value
+
     def get_unscoped_auth_ref(self, session):
         """Authenticate with OpenID Connect and get back claims.