diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-10 00:21:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-10 00:21:02 +0000 |
| commit | 27dc7d4625116dc11d924b3ac60c722a7278ffbb (patch) | |
| tree | c0dc63abd2e358fab751a97ca9a6db5829ca6745 | |
| parent | b08df770c15eba3be7e0fafb9ea2f8a4b4cf54e5 (diff) | |
| parent | 5f5f8f616bb01527adb29f77483d7d3e7f1678c7 (diff) | |
Merge "Check CONF values *after* command line args are parsed"
| -rwxr-xr-x | bin/nova-novncproxy | 6 | ||||
| -rwxr-xr-x | bin/nova-spicehtml5proxy | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/bin/nova-novncproxy b/bin/nova-novncproxy index 37486f6a4..29981f53f 100755 --- a/bin/nova-novncproxy +++ b/bin/nova-novncproxy @@ -66,12 +66,12 @@ CONF.import_opt('debug', 'nova.openstack.common.log') if __name__ == '__main__': - if CONF.ssl_only and not os.path.exists(CONF.cert): - parser.error("SSL only and %s not found" % CONF.cert) - # Setup flags config.parse_args(sys.argv) + if CONF.ssl_only and not os.path.exists(CONF.cert): + parser.error("SSL only and %s not found" % CONF.cert) + # Check to see if novnc html/js/css files are present if not os.path.exists(CONF.web): print "Can not find novnc html/js/css files at %s." % CONF.web diff --git a/bin/nova-spicehtml5proxy b/bin/nova-spicehtml5proxy index a4c97a73d..012a202ec 100755 --- a/bin/nova-spicehtml5proxy +++ b/bin/nova-spicehtml5proxy @@ -66,12 +66,12 @@ CONF.import_opt('debug', 'nova.openstack.common.log') if __name__ == '__main__': - if CONF.ssl_only and not os.path.exists(CONF.cert): - parser.error("SSL only and %s not found" % CONF.cert) - # Setup flags config.parse_args(sys.argv) + if CONF.ssl_only and not os.path.exists(CONF.cert): + parser.error("SSL only and %s not found" % CONF.cert) + # Check to see if spice html/js/css files are present if not os.path.exists(CONF.web): print "Can not find spice html/js/css files at %s." % CONF.web |