valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

even more context for log message when available

Browse Source
This commit is contained in:
Jorge Schrauwen 2015-11-11 16:22:38 +00:00
parent e82d819f03
commit b58793cb72
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
salt/states/smartos.py
View File

@ -75,7 +75,7 @@ def _load_config():
continue continue
optval = optval.split('=') optval = optval.split('=')
config[optval[0].lower()] = optval[1].strip() config[optval[0].lower()] = optval[1].strip()
log.debug('smartos - read /usbkey/config: {0}'.format(config)) log.debug('smartos.config - read /usbkey/config: {0}'.format(config))
return config return config
@ -93,7 +93,7 @@ def _write_config(config):
salt.utils.files.rename('/usbkey/config.salt', '/usbkey/config') salt.utils.files.rename('/usbkey/config.salt', '/usbkey/config')
except IOError: except IOError:
return False return False
log.debug('smartos - wrote /usbkey/config: {0}'.format(config)) log.debug('smartos.config - wrote /usbkey/config: {0}'.format(config))
return True return True
else: else:
return False return False
@ -109,9 +109,9 @@ def _parse_state_config(config, default_config):
if isinstance(cfg_item[k], (bool)): if isinstance(cfg_item[k], (bool)):
default_config[k] = cfg_item[k] default_config[k] = cfg_item[k]
else: else:
log.warning('smartos.vm_present - config property {0} must be bool, using default: {1}'.format(k, default_config[k])) log.warning('smartos.vm_present::config - property {0} must be bool, using default: {1}'.format(k, default_config[k]))
else: else:
log.warning('smartos.vm_present - config property {0} not one of {1}'.format(k, default_config.keys())) log.warning('smartos.vm_present::config - property {0} not one of {1}'.format(k, default_config.keys()))
return default_config return default_config
@ -143,7 +143,7 @@ def _parse_vmconfig(config):
instance[k] = dataset[k] instance[k] = dataset[k]
vmconfig.append(instance) vmconfig.append(instance)
else: else:
log.error('smartos.vm_present - failed to parse vmconfig') log.error('smartos.vm_present::parse_vmconfig - failed to parse')
return vmconfig return vmconfig
@ -425,7 +425,7 @@ def vm_present(name, vmconfig, config=None):
'reprovision': False 'reprovision': False
} }
) )
log.debug('smartos.vm_present - config for {0} is {1}'.format(name, config)) log.debug('smartos.vm_present::{0}::config - {1}'.format(name, config))
# map special vmconfig parameters # map special vmconfig parameters
# collections have set/remove handlers # collections have set/remove handlers
@ -448,7 +448,7 @@ def vm_present(name, vmconfig, config=None):
# parse vmconfig # parse vmconfig
vmconfig = _parse_vmconfig(vmconfig) vmconfig = _parse_vmconfig(vmconfig)
log.debug('smartos.vm_present - vmconfig: {0}'.format(vmconfig)) log.debug('smartos.vm_present::{0}::vmconfig - {1}'.format(name, vmconfig))
# set hostname if needed # set hostname if needed
if 'hostname' not in vmconfig: if 'hostname' not in vmconfig:
@ -653,7 +653,9 @@ def vm_present(name, vmconfig, config=None):
ret['changes'][vmconfig['state']['hostname']] = {} ret['changes'][vmconfig['state']['hostname']] = {}
ret['changes'][vmconfig['state']['hostname']]['image_uuid'] = vmconfig['reprovision_uuid'] ret['changes'][vmconfig['state']['hostname']]['image_uuid'] = vmconfig['reprovision_uuid']
else: else:
log.warning('smartos.vm_present - image_uuid in state does not match current, reprovision not allowed') log.warning('smartos.vm_present::{0}::reprovision - image_uuid in state does not match current, reprovision not allowed'.format(
name
))
else: else:
ret['comment'] = 'vm {0} failed to be updated'.format(vmconfig['state']['hostname']) ret['comment'] = 'vm {0} failed to be updated'.format(vmconfig['state']['hostname'])
else: else: