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
openstack · Mar 20, 2012 · 3e4653a · 3e4653a
1 parent 9c82397
commit 3e4653a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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