diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-04-12 05:54:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-04-12 05:54:32 +0000 |
| commit | 49123838d797d3e07b57a8abb508bc016c2dfd59 (patch) | |
| tree | 8c04632a6be9c124883b420ed4010059e4418751 | |
| parent | 28ef9cdcc6073c2f6600d30b401dcbce81afd4df (diff) | |
| parent | b94f62a67b90ba030c38b2770e3f96ba1b155c55 (diff) | |
| download | keystone-49123838d797d3e07b57a8abb508bc016c2dfd59.tar.gz keystone-49123838d797d3e07b57a8abb508bc016c2dfd59.tar.xz keystone-49123838d797d3e07b57a8abb508bc016c2dfd59.zip | |
Merge "Use string for port in default endpoints (bug 1160573)"
| -rw-r--r-- | etc/keystone.conf.sample | 4 | ||||
| -rw-r--r-- | keystone/common/config.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/etc/keystone.conf.sample b/etc/keystone.conf.sample index 5ebddea4..8cb2cca3 100644 --- a/etc/keystone.conf.sample +++ b/etc/keystone.conf.sample @@ -13,8 +13,8 @@ # The base endpoint URLs for keystone that are advertised to clients # (NOTE: this does NOT affect how keystone listens for connections) -# public_endpoint = http://localhost:%(public_port)d/ -# admin_endpoint = http://localhost:%(admin_port)d/ +# public_endpoint = http://localhost:%(public_port)s/ +# admin_endpoint = http://localhost:%(admin_port)s/ # The port number which the OpenStack Compute service listens on # compute_port = 8774 diff --git a/keystone/common/config.py b/keystone/common/config.py index a4fa4901..d7b6ff73 100644 --- a/keystone/common/config.py +++ b/keystone/common/config.py @@ -194,8 +194,8 @@ def configure(): register_int('admin_port', default=35357) register_int('public_port', default=5000) register_str( - 'public_endpoint', default='http://localhost:%(public_port)d/') - register_str('admin_endpoint', default='http://localhost:%(admin_port)d/') + 'public_endpoint', default='http://localhost:%(public_port)s/') + register_str('admin_endpoint', default='http://localhost:%(admin_port)s/') register_str('onready') register_str('auth_admin_prefix', default='') register_str('policy_file', default='policy.json') |