From 3e4653a3914e84aec72ba159c4d23edba8ced48f Mon Sep 17 00:00:00 2001 From: termie Date: Tue, 20 Mar 2012 10:47:31 -0700 Subject: [PATCH] fix keystone-all's usage of options vs conf we shouldn't be using options at all, that was a leftover piece of code from a long time ago. invalidates bug 949373 Change-Id: I29fcbd5f641464bda985900172b55bca45843f81 --- bin/keystone-all | 8 ++++---- etc/keystone.conf | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/keystone-all b/bin/keystone-all index f7221ae153..1dd7884023 100755 --- a/bin/keystone-all +++ b/bin/keystone-all @@ -65,10 +65,10 @@ if __name__ == '__main__': servers = [] servers.append(create_server(CONF.config_file[0], 'admin', - options['bind_host'], - int(options['admin_port']))) + CONF.bind_host, + int(CONF.admin_port))) servers.append(create_server(CONF.config_file[0], 'main', - options['bind_host'], - int(options['public_port']))) + CONF.bind_host, + int(CONF.public_port))) serve(*servers) diff --git a/etc/keystone.conf b/etc/keystone.conf index 56309c314e..3ecf641e92 100644 --- a/etc/keystone.conf +++ b/etc/keystone.conf @@ -1,5 +1,5 @@ [DEFAULT] -bind_host = 0.0.0.0 +#bind_host = 0.0.0.0 public_port = 5000 admin_port = 35357 admin_token = ADMIN