diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-03-20 18:04:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-03-20 18:04:22 +0000 |
| commit | 57f1cb2c4a37ef0040321732fb64fc6cde02126d (patch) | |
| tree | 47f8f128d4fc3f57134e3939baa02c4db501906f /bin | |
| parent | 80c7936b3147d53659025a76ac232de986f5ce64 (diff) | |
| parent | 3e4653a3914e84aec72ba159c4d23edba8ced48f (diff) | |
| download | keystone-57f1cb2c4a37ef0040321732fb64fc6cde02126d.tar.gz keystone-57f1cb2c4a37ef0040321732fb64fc6cde02126d.tar.xz keystone-57f1cb2c4a37ef0040321732fb64fc6cde02126d.zip | |
Merge "fix keystone-all's usage of options vs conf"
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 8792d36e..380ebbde 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) |