diff options
| author | termie <github@anarkystic.com> | 2012-03-20 10:47:31 -0700 |
|---|---|---|
| committer | termie <github@anarkystic.com> | 2012-03-20 10:47:31 -0700 |
| commit | 3e4653a3914e84aec72ba159c4d23edba8ced48f (patch) | |
| tree | 914e5afff13b6c0bf8a3c18e8e25019752f84195 /bin | |
| parent | 9c823977baca9944074c62cedf32f5107a95a443 (diff) | |
| download | keystone-3e4653a3914e84aec72ba159c4d23edba8ced48f.tar.gz keystone-3e4653a3914e84aec72ba159c4d23edba8ced48f.tar.xz keystone-3e4653a3914e84aec72ba159c4d23edba8ced48f.zip | |
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
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/keystone-all | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/keystone-all b/bin/keystone-all index f7221ae1..1dd78840 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) |