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

Merge pull request #16485 from steverweber/cloud_state

Browse Source 
use cloud.has_instance to cleanup some code
This commit is contained in:
Joseph Hall 2014-10-09 08:30:01 -06:00
commit f629aff547
1 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
salt/states/cloud.py
View File

@ -77,10 +77,8 @@ def present(name, cloud_provider, onlyif=None, unless=None, **kwargs):
'changes': {}, 'changes': {},
'result': None, 'result': None,
'comment': ''} 'comment': ''}
instance = __salt__['cloud.action'](
fun='show_instance', names=[name])
retcode = __salt__['cmd.retcode'] retcode = __salt__['cmd.retcode']
prov = str([a for a in instance][0])
if onlyif is not None: if onlyif is not None:
if not isinstance(onlyif, string_types): if not isinstance(onlyif, string_types):
if not onlyif: if not onlyif:
@ -95,14 +93,18 @@ def present(name, cloud_provider, onlyif=None, unless=None, **kwargs):
elif isinstance(unless, string_types): elif isinstance(unless, string_types):
if retcode(unless) == 0: if retcode(unless) == 0:
return _valid(name, comment='unless execution succeeded') return _valid(name, comment='unless execution succeeded')
if instance and 'Not Actioned' not in prov:
# provider=None not cloud_provider because
# need to ensure ALL providers dont have the instance
if __salt__['cloud.has_instance'](name=name, provider=None):
ret['result'] = True ret['result'] = True
ret['comment'] = 'Instance {0} already exists in {1}'.format(name, ret['comment'] = 'Already present instance {0}'.format(name)
prov)
return ret return ret
if __opts__['test']: if __opts__['test']:
ret['comment'] = 'Instance {0} needs to be created'.format(name) ret['comment'] = 'Instance {0} needs to be created'.format(name)
return ret return ret
info = __salt__['cloud.create'](cloud_provider, name, **kwargs) info = __salt__['cloud.create'](cloud_provider, name, **kwargs)
if info and 'Error' not in info: if info and 'Error' not in info:
ret['changes'] = info ret['changes'] = info
@ -153,16 +155,7 @@ def absent(name, onlyif=None, unless=None):
'result': None, 'result': None,
'comment': ''} 'comment': ''}
retcode = __salt__['cmd.retcode'] retcode = __salt__['cmd.retcode']
instance = __salt__['cloud.action'](fun='show_instance', names=[name])
if not instance or \
('Not Actioned/Not Running' in ret
and name in ret['Not Actioned/Not Running']):
ret['result'] = True
ret['comment'] = 'Instance {0} already absent'.format(name)
return ret
if __opts__['test']:
ret['comment'] = 'Instance {0} needs to be destroyed'.format(name)
return ret
if onlyif is not None: if onlyif is not None:
if not isinstance(onlyif, string_types): if not isinstance(onlyif, string_types):
if not onlyif: if not onlyif:
@ -177,6 +170,16 @@ def absent(name, onlyif=None, unless=None):
elif isinstance(unless, string_types): elif isinstance(unless, string_types):
if retcode(unless) == 0: if retcode(unless) == 0:
return _valid(name, comment='unless execution succeeded') return _valid(name, comment='unless execution succeeded')
if __salt__['cloud.has_instance'](name=name, provider=None):
ret['result'] = True
ret['comment'] = 'Already absent instance {0}'.format(name)
return ret
if __opts__['test']:
ret['comment'] = 'Instance {0} needs to be destroyed'.format(name)
return ret
info = __salt__['cloud.destroy'](name) info = __salt__['cloud.destroy'](name)
if info and 'Error' not in info: if info and 'Error' not in info:
ret['changes'] = info ret['changes'] = info
@ -242,15 +245,17 @@ def profile(name, profile, onlyif=None, unless=None, **kwargs):
if retcode(unless) == 0: if retcode(unless) == 0:
return _valid(name, comment='unless execution succeeded') return _valid(name, comment='unless execution succeeded')
instance = __salt__['cloud.action'](fun='show_instance', names=[name]) instance = __salt__['cloud.action'](fun='show_instance', names=[name])
prov = str(instance.keys()[0])
if instance and 'Not Actioned' not in prov: # need to ensure ALL providers dont have the instance
if __salt__['cloud.has_instance'](name=name, provider=None):
ret['result'] = True ret['result'] = True
ret['comment'] = 'Instance {0} already exists in {1}'.format( ret['comment'] = 'Already present instance {0}'.format(name)
name, prov)
return ret return ret
if __opts__['test']: if __opts__['test']:
ret['comment'] = 'Instance {0} needs to be created'.format(name) ret['comment'] = 'Instance {0} needs to be created'.format(name)
return ret return ret
info = __salt__['cloud.profile'](profile, name, vm_overrides=kwargs) info = __salt__['cloud.profile'](profile, name, vm_overrides=kwargs)
# get either {Error: ''} or {namestring: {Error: ''}} # get either {Error: ''} or {namestring: {Error: ''}}