← Back to branch summary

~ubuntu-cloud-archive/ubuntu/precise/keystone/folsom

« back to all changes in this revision

Viewing changes to bin/keystone-all

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2012-03-26 13:41:45 UTC
  • mto: (35.1.2 keystone)
  • mto: This revision was merged to the branch mainline in revision 23.
  • Revision ID: package-import@ubuntu.com-20120326134145-rq0l7xymweuap1ir
Tags: upstream-2012.1~rc1
Import upstream version 2012.1~rc1

Show diffs side-by-side

added added

removed removed

Lines of Context:
bin/keystone-all
52
52
    if os.path.exists(dev_conf):
53
53
        config_files = [dev_conf]
54
54
 
55
 
    CONF(config_files=config_files)
 
55
    CONF(config_files=config_files, args=sys.argv)
56
56
 
57
57
    config.setup_logging(CONF)
58
58
 
65
65
    servers = []
66
66
    servers.append(create_server(CONF.config_file[0],
67
67
                                 'admin',
68
 
                                 options['bind_host'],
69
 
                                 int(options['admin_port'])))
 
68
                                 CONF.bind_host,
 
69
                                 int(CONF.admin_port)))
70
70
    servers.append(create_server(CONF.config_file[0],
71
71
                                 'main',
72
 
                                 options['bind_host'],
73
 
                                 int(options['public_port'])))
 
72
                                 CONF.bind_host,
 
73
                                 int(CONF.public_port)))
74
74
    serve(*servers)