Merge pull request #82 from dolph/master

Global fixes for issues #33 and #65

3 files changed, 21 insertions, 18 deletions

diff --git a/bin/keystone b/bin/keystone
index 4664f80d..1725ed25 100755
--- a/bin/keystone
+++ b/bin/keystone
@@ -69,20 +69,20 @@ if __name__ == '__main__':
             config_file = config.find_config_file(options, args)
             print "Using config file:", config_file
         
-        # Load API server
+        # Load Public API server
         server = wsgi.Server()
-        server.start(app, int(conf['server_bind_port']),
-                     conf['server_bind_host'])
-        print "Service API listening on %s:%s" % (conf['server_bind_host'],
-                                              conf['server_bind_port'])
-
+        server.start(app, int(conf['public_port']), conf['public_host'])
+        
+        print "Service API listening on %s:%s" % (
+            conf['public_host'], conf['public_port'])
+        
         # Load Admin API server
         admin_server = wsgi.Server()
-        admin_bind = options.get('admin_port') or admin_conf.get('bind_port')
-        admin_server.start(admin_app, int(admin_bind),
-                           admin_conf['bind_host'])
-        print "Admin API listening on %s:%s" % (admin_conf['bind_host'],
-                                              admin_bind)
+        admin_server.start(admin_app,
+            int(conf['admin_port']), conf['admin_host'])
+        
+        print "Admin API listening on %s:%s" % (
+            conf['admin_host'], conf['admin_port'])
         
         # Wait until done
         server.wait()
diff --git a/bin/keystone-admin b/bin/keystone-admin
index bf40c9fd..388e22fe 100755
--- a/bin/keystone-admin
+++ b/bin/keystone-admin
@@ -63,9 +63,10 @@ if __name__ == '__main__':
             print "Using config file:", config_file
 
         server = wsgi.Server()
-        server.start(app, int(conf['bind_port']), conf['bind_host'])
-        print "Admin API listening on %s:%s" % (conf['bind_host'],
-                                              conf['bind_port'])
+        server.start(app, int(conf['admin_port']), conf['admin_host'])
+        
+        print "Admin API listening on %s:%s" % (
+            conf['admin_host'], conf['admin_port'])
 
         server.wait()
     except RuntimeError, e:
diff --git a/bin/keystone-auth b/bin/keystone-auth
index 4ac26b33..368872b4 100755
--- a/bin/keystone-auth
+++ b/bin/keystone-auth
@@ -54,6 +54,7 @@ if __name__ == '__main__':
     try:
         # Load Service API server
         conf, app = config.load_paste_app('keystone-legacy-auth', options, args)
+        
         debug = options.get('debug') or conf.get('debug', False)
         debug = debug in [True, "True", "1"]
         verbose = options.get('verbose') or conf.get('verbose', False)
@@ -63,10 +64,11 @@ if __name__ == '__main__':
             print "Using config file:", config_file
         
         server = wsgi.Server()
-        server.start(app, int(conf['server_bind_port']),
-                     conf['server_bind_host'])
-        print "Service API listening on %s:%s" % (conf['server_bind_host'],
-                                              conf['server_bind_port'])
+        server.start(app, int(conf['public_port']), conf['public_host'])
+        
+        print "Service API listening on %s:%s" % (
+            conf['public_host'], conf['public_port'])
+        
         server.wait()
     except RuntimeError, e:
         sys.exit("ERROR: %s" % e)