x/cloud-init
Code Issues Proposed changes

Capture IOError and use LOG better

Browse Source
This commit is contained in:
Joshua Harlow 2014-02-08 13:16:07 -08:00
parent 8b583e5323
commit 267b7914c9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cloudinit/sources/DataSourceConfigDrive.py
View File

@ -87,7 +87,7 @@ class DataSourceConfigDrive(openstack.SourceMixin, sources.DataSource):
md = util.mergemanydict([md, DEFAULT_METADATA]) md = util.mergemanydict([md, DEFAULT_METADATA])
user_dsmode = results.get('dsmode', None) user_dsmode = results.get('dsmode', None)
if user_dsmode not in VALID_DSMODES + (None,): if user_dsmode not in VALID_DSMODES + (None,):
LOG.warn("User specified invalid mode: %s" % user_dsmode) LOG.warn("User specified invalid mode: %s", user_dsmode)
user_dsmode = None user_dsmode = None
dsmode = get_ds_mode(cfgdrv_ver=results['version'], dsmode = get_ds_mode(cfgdrv_ver=results['version'],

4
cloudinit/sources/DataSourceOpenStack.py
View File

@ -126,14 +126,14 @@ class DataSourceOpenStack(openstack.SourceMixin, sources.DataSource):
'version': openstack.OS_LATEST}) 'version': openstack.OS_LATEST})
except openstack.NonReadable: except openstack.NonReadable:
return False return False
except openstack.BrokenMetadata: except (openstack.BrokenMetadata, IOError):
util.logexc(LOG, "Broken metadata address %s", util.logexc(LOG, "Broken metadata address %s",
self.metadata_address) self.metadata_address)
return False return False
user_dsmode = results.get('dsmode', None) user_dsmode = results.get('dsmode', None)
if user_dsmode not in VALID_DSMODES + (None,): if user_dsmode not in VALID_DSMODES + (None,):
LOG.warn("User specified invalid mode: %s" % user_dsmode) LOG.warn("User specified invalid mode: %s", user_dsmode)
user_dsmode = None user_dsmode = None
if user_dsmode == 'disabled': if user_dsmode == 'disabled':
return False return False