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
This commit is contained in:
parent
9c823977ba
commit
3e4653a391
|
@ -65,10 +65,10 @@ if __name__ == '__main__':
|
||||||
servers = []
|
servers = []
|
||||||
servers.append(create_server(CONF.config_file[0],
|
servers.append(create_server(CONF.config_file[0],
|
||||||
'admin',
|
'admin',
|
||||||
options['bind_host'],
|
CONF.bind_host,
|
||||||
int(options['admin_port'])))
|
int(CONF.admin_port)))
|
||||||
servers.append(create_server(CONF.config_file[0],
|
servers.append(create_server(CONF.config_file[0],
|
||||||
'main',
|
'main',
|
||||||
options['bind_host'],
|
CONF.bind_host,
|
||||||
int(options['public_port'])))
|
int(CONF.public_port)))
|
||||||
serve(*servers)
|
serve(*servers)
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
[DEFAULT]
|
[DEFAULT]
|
||||||
bind_host = 0.0.0.0
|
#bind_host = 0.0.0.0
|
||||||
public_port = 5000
|
public_port = 5000
|
||||||
admin_port = 35357
|
admin_port = 35357
|
||||||
admin_token = ADMIN
|
admin_token = ADMIN
|
||||||
|
|
Loading…
Reference in New Issue