Add 'versionadded'

This commit is contained in:
C. R. Oldham 2015-11-17 11:54:31 -07:00
parent 1e9214f4e4
commit 4b382e977d
4 changed files with 6 additions and 12 deletions

View file

@ -1200,7 +1200,7 @@ DEFAULT_PROXY_MINION_OPTS = {
# salt.vt will have trouble with our forking model.
# Proxies with non-persistent (mostly REST API) connections
# can change this back to True
'multiprocessing': False
'multiprocessing': True
}
# ----- Salt Cloud Configuration Defaults ----------------------------------->

View file

@ -34,6 +34,8 @@ def _grains():
'''
Get the grains from the proxied device
'''
username = __pillar__['proxy']['admin_username']
password = __pillar__['proxy']['admin_password']
r = salt.modules.dracr.system_info(host=__pillar__['proxy']['host'],
admin_username=__pillar__['proxy']['admin_username'],
admin_password=__pillar__['proxy']['admin_password'])

View file

@ -283,8 +283,10 @@ def chconfig(cmd, *args, **kwargs):
# Catch password reset
if cmd == 'change_password':
if 'username' in kwargs:
__opts__['proxy']['admin_username'] = kwargs['username']
DETAILS['admin_username'] = kwargs['username']
if 'password' in kwargs:
__opts__['proxy']['admin_password'] = kwargs['password']
DETAILS['admin_password'] = kwargs['password']
if 'dracr.'+cmd not in __salt__:
return {'retcode': -1, 'message': 'dracr.' + cmd + ' is not available'}

View file

@ -105,17 +105,6 @@ pillar stated above:
- {{ k }}: {{ v }}
{% endfor %}
{% for k, v in details['switches'].iteritems() %}
standup-switches-{{ k }}:
dellchassis.switch:
- name: {{ k }}
- ip: {{ v['ip'] }}
- netmask: {{ v['netmask'] }}
- gateway: {{ v['gateway'] }}
- password: {{ v['password'] }}
- snmp: {{ v['snmp'] }}
{% endfor %}
blade_powercycle:
dellchassis.chassis:
- blade_power_states:
@ -252,6 +241,7 @@ def chassis(name, chassis_name=None, password=None, datacenter=None,
- server-3: powercycle
'''
ret = {'name': chassis_name,
'chassis_name': chassis_name,
'result': True,
'changes': {},
'comment': ''}