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

make the code a bit simpler

Browse Source
This commit is contained in:
Andreas Lutro 2016-02-06 19:36:51 +01:00
parent aba29a73c4
commit 95c8e74b72
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
salt/states/rabbitmq_vhost.py
View File

@ -70,25 +70,22 @@ def present(name):
vhost_exists = __salt__['rabbitmq.vhost_exists'](name)
if __opts__['test']:
if vhost_exists:
ret['result'] = True
ret['comment'] = 'VHost {0} already exists'.format(name)
else:
ret['result'] = None
ret['comment'] = 'Creating VHost {0}'.format(name)
if vhost_exists:
ret['comment'] = 'VHost {0} already exists'.format(name)
return ret
else:
if vhost_exists:
ret['comment'] = 'VHost {0} already exists'.format(name)
else:
result = __salt__['rabbitmq.add_vhost'](name)
if 'Error' in result:
ret['result'] = False
ret['comment'] = result['Error']
elif 'Added' in result:
ret['comment'] = result['Added']
ret['changes'] = {'old': '', 'new': name}
if __opts__['test']:
ret['result'] = None
ret['comment'] = 'Creating VHost {0}'.format(name)
return ret
result = __salt__['rabbitmq.add_vhost'](name)
if 'Error' in result:
ret['result'] = False
ret['comment'] = result['Error']
elif 'Added' in result:
ret['comment'] = result['Added']
ret['changes'] = {'old': '', 'new': name}
return ret