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 | |
| parent | 80c7936b3147d53659025a76ac232de986f5ce64 (diff) | |
| parent | 3e4653a3914e84aec72ba159c4d23edba8ced48f (diff) | |
Merge "fix keystone-all's usage of options vs conf"
| -rwxr-xr-x | bin/keystone-all | 8 | ||||
| -rw-r--r-- | etc/keystone.conf | 2 |
2 files changed, 5 insertions, 5 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) diff --git a/etc/keystone.conf b/etc/keystone.conf index 56309c31..3ecf641e 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 |