summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorDevin Carlen <devin.carlen@gmail.com>2012-03-03 14:01:46 -0800
committerDevin Carlen <devin.carlen@gmail.com>2012-03-07 12:54:27 -0800
commitd0429ea9b8849f99aa170cd09aef7776e2651dbf (patch)
tree6ced31803cdcd93464eae586f8591b4dddbf852a /bin
parentfe6414c8c1f769e6cc87fc001b6c52c5fea0f160 (diff)
downloadkeystone-d0429ea9b8849f99aa170cd09aef7776e2651dbf.tar.gz
keystone-d0429ea9b8849f99aa170cd09aef7776e2651dbf.tar.xz
keystone-d0429ea9b8849f99aa170cd09aef7776e2651dbf.zip
Make bind host configurable
* fixes bug 945868 Change-Id: Ib33dc9ad1878a9215c1a1ab10814fa7d0905cbdb
Diffstat (limited to 'bin')
-rwxr-xr-xbin/keystone-all6
1 files changed, 4 insertions, 2 deletions
diff --git a/bin/keystone-all b/bin/keystone-all
index 5dddd147..f7221ae1 100755
--- a/bin/keystone-all
+++ b/bin/keystone-all
@@ -25,9 +25,9 @@ from keystone.common import wsgi
CONF = config.CONF
-def create_server(conf, name, port):
+def create_server(conf, name, host, port):
app = deploy.loadapp('config:%s' % conf, name=name)
- return wsgi.Server(app, port)
+ return wsgi.Server(app, host=host, port=port)
def serve(*servers):
@@ -65,8 +65,10 @@ if __name__ == '__main__':
servers = []
servers.append(create_server(CONF.config_file[0],
'admin',
+ options['bind_host'],
int(options['admin_port'])))
servers.append(create_server(CONF.config_file[0],
'main',
+ options['bind_host'],
int(options['public_port'])))
serve(*servers)