x/gantt
Code Issues Proposed changes

Merge "Check CONF values *after* command line args are parsed"

Browse Source
This commit is contained in:
Jenkins
2013-03-10 00:21:02 +00:00
committed by Gerrit Code Review
parent db51211f94 b8d6754e1f
commit b654381493
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bin/nova-novncproxy
View File

@@ -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

6
bin/nova-spicehtml5proxy
View File

@@ -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