opendev
/
glean
Code Issues Proposed changes

Merge "Explain difference between config drive files"

This commit is contained in:
Jenkins 2016-07-07 21:25:15 +00:00 committed by Gerrit Code Review
parent a066a675c5 1d9204f820
commit c520f451ec
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
glean/cmd.py
View File

@ -701,6 +701,9 @@ def get_network_info(args):
if os.path.exists(network_info_file):
log.debug("Found network_info file %s" % network_info_file)
network_info = json.load(open(network_info_file))
# network_data.json is the file written by nova that should be there.
# Other cloud deployments may use the above network_info.json or
# vendor_data.json but the canonical location is this one.
if os.path.exists(network_data_file):
log.debug("Found network_info file %s" % network_data_file)
network_info = json.load(open(network_data_file))