From b94f62a67b90ba030c38b2770e3f96ba1b155c55 Mon Sep 17 00:00:00 2001 From: Dolph Mathews Date: Tue, 26 Mar 2013 17:34:03 -0500 Subject: [PATCH] Use string for port in default endpoints (bug 1160573) Change-Id: I940f331eee14e449333e5d0ba5d071836a496653 --- etc/keystone.conf.sample | 4 ++-- 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 9e66eb623a..6affe4ab0a 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 bcfc347ccf..c10fd0073b 100644 --- a/keystone/common/config.py +++ b/keystone/common/config.py @@ -187,8 +187,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')