diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-03-10 07:35:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-03-10 07:35:54 +0000 |
| commit | ee5083d7b4d7c9f3d687ccba6fe652af0966b9e0 (patch) | |
| tree | f3a884609166104b7fd6d56b3cd264f155e406ed | |
| parent | b5c8b3a81911491c97ee95e741c75ffd269f382a (diff) | |
| parent | 94abc7ed3e8105cf80ad60558d01fc0839adc027 (diff) | |
Merge "Make sure we have a port number before int it."
| -rw-r--r-- | keystone/middleware/auth_token.py | 3 | ||||
| -rw-r--r-- | keystone/middleware/s3_token.py | 9 |
2 files changed, 2 insertions, 10 deletions
diff --git a/keystone/middleware/auth_token.py b/keystone/middleware/auth_token.py index 095b6964..9f056034 100644 --- a/keystone/middleware/auth_token.py +++ b/keystone/middleware/auth_token.py @@ -125,8 +125,7 @@ class AuthProtocol(object): # where to find the auth service (we use this to validate tokens) self.auth_host = conf.get('auth_host') - self.auth_port = int(conf.get('auth_port')) - + self.auth_port = int(conf.get('auth_port', 35357)) auth_protocol = conf.get('auth_protocol', 'https') if auth_protocol == 'http': self.http_client_class = httplib.HTTPConnection diff --git a/keystone/middleware/s3_token.py b/keystone/middleware/s3_token.py index 8cf3e0a0..348fcc40 100644 --- a/keystone/middleware/s3_token.py +++ b/keystone/middleware/s3_token.py @@ -45,16 +45,9 @@ class S3Token(object): # where to find the auth service (we use this to validate tokens) self.auth_host = conf.get('auth_host') - self.auth_port = int(conf.get('auth_port')) + self.auth_port = int(conf.get('auth_port', 35357)) self.auth_protocol = conf.get('auth_protocol', 'https') - # where to tell clients to find the auth service (default to url - # constructed based on endpoint we have for the service to use) - self.auth_location = conf.get('auth_uri', - '%s://%s:%s' % (self.auth_protocol, - self.auth_host, - self.auth_port)) - # Credentials used to verify this component with the Auth service since # validating tokens is a privileged call self.admin_token = conf.get('admin_token') |