1 files changed, 44 insertions, 4 deletions

diff --git a/keystoneclient/auth/identity/v2.py b/keystoneclient/auth/identity/v2.py
index 3ea74b7..fd8b422 100644
--- a/keystoneclient/auth/identity/v2.py
+++ b/keystoneclient/auth/identity/v2.py
@@ -57,10 +57,20 @@ class Auth(base.BaseIdentityPlugin):
         super(Auth, self).__init__(auth_url=auth_url,
                                    reauthenticate=reauthenticate)
 
-        self.trust_id = trust_id
+        self._trust_id = trust_id
         self.tenant_id = tenant_id
         self.tenant_name = tenant_name
 
+    @property
+    def trust_id(self):
+        # Override to remove deprecation.
+        return self._trust_id
+
+    @trust_id.setter
+    def trust_id(self, value):
+        # Override to remove deprecation.
+        self._trust_id = value
+
     def get_auth_ref(self, session, **kwargs):
         headers = {'Accept': 'application/json'}
         url = self.auth_url.rstrip('/') + '/tokens'
@@ -131,8 +141,28 @@ class Password(Auth):
             user_id = None
 
         self.user_id = user_id
-        self.username = username
-        self.password = password
+        self._username = username
+        self._password = password
+
+    @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_auth_data(self, headers=None):
         auth = {'password': self.password}
@@ -182,7 +212,17 @@ class Token(Auth):
 
     def __init__(self, auth_url, token, **kwargs):
         super(Token, self).__init__(auth_url, **kwargs)
-        self.token = token
+        self._token = token
+
+    @property
+    def token(self):
+        # Override to remove deprecation.
+        return self._token
+
+    @token.setter
+    def token(self, value):
+        # Override to remove deprecation.
+        self._token = value
 
     def get_auth_data(self, headers=None):
         if headers is not None: