nova-novncproxy

28a29,30
> from oslo.config import cfg
>
32c34
< from nova import flags
---
> from nova import config
34d35
< from nova.openstack.common import cfg
67,68c68,69
< FLAGS = flags.FLAGS
< FLAGS.register_cli_opts(opts)
---
> CONF = cfg.CONF
> CONF.register_cli_opts(opts)
73c74
<     rpc.register_opts(FLAGS)
---
>     rpc.register_opts(CONF)
131,132c132,133
<     if FLAGS.ssl_only and not os.path.exists(FLAGS.cert):
<         parser.error("SSL only and %s not found" % FLAGS.cert)
---
>     if CONF.ssl_only and not os.path.exists(CONF.cert):
>         parser.error("SSL only and %s not found" % CONF.cert)
134,135c135,136
<     # Setup flags
<     flags.parse_args(sys.argv)
---
>     # Setup cfg
>     config.parse_args(sys.argv)
138,147c139,148
<     server = NovaWebSocketProxy(listen_host=FLAGS.novncproxy_host,
<                                 listen_port=FLAGS.novncproxy_port,
<                                 source_is_ipv6=FLAGS.source_is_ipv6,
<                                 verbose=FLAGS.verbose,
<                                 cert=FLAGS.cert,
<                                 key=FLAGS.key,
<                                 ssl_only=FLAGS.ssl_only,
<                                 daemon=FLAGS.daemon,
<                                 record=FLAGS.record,
<                                 web=FLAGS.web,
---
>     server = NovaWebSocketProxy(listen_host=CONF.novncproxy_host,
>                                 listen_port=CONF.novncproxy_port,
>                                 source_is_ipv6=CONF.source_is_ipv6,
>                                 verbose=CONF.verbose,
>                                 cert=CONF.cert,
>                                 key=CONF.key,
>                                 ssl_only=CONF.ssl_only,
>                                 daemon=CONF.daemon,
>                                 record=CONF.record,
>                                 web=CONF.web,