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

Finish the idrac state, fix problem with grains not loading sometimes.

Browse Source
This commit is contained in:
C. R. Oldham 2016-02-04 15:05:36 -07:00
parent 276cf626b0
commit 05979010f5
4 changed files with 139 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
salt/grains/fx2.py
View File

@ -42,9 +42,10 @@ def _find_credentials():
for user in usernames:
for pwd in __pillar__['proxy']['passwords']:
r = __salt__['dracr.get_chassis_name'](host=__pillar__['proxy']['host'],
admin_username=user,
admin_password=pwd)
r = salt.modules.dracr.get_chassis_name(
host=__pillar__['proxy']['host'],
admin_username=user,
admin_password=pwd)
# Retcode will be present if the chassis_name call failed
try:
if r.get('retcode', None) is None:

7
salt/modules/chassis.py
View File

@ -34,10 +34,15 @@ def __virtual__():
return __virtualname__
return False
def chassis_credentials():
proxyprefix = __opts__['proxy']['proxytype']
(username, password) = __proxy__[proxyprefix+'.find_credentials']()
return (username, password)
def cmd(cmd, *args, **kwargs):
proxyprefix = __opts__['proxy']['proxytype']
(username, password) = __proxy__[proxyprefix+'.find_credentials']()
(username, password) = chassis_credentials()
kwargs['admin_username'] = username
kwargs['admin_password'] = password
kwargs['host'] = __proxy__[proxyprefix+'.host']()

16
salt/modules/dracr.py
View File

@ -137,8 +137,13 @@ def __execute_ret(command, host=None,
for l in cmd['stdout'].splitlines():
if l.startswith('Security Alert'):
continue
if l.startswith('RAC1168:'):
break
if l.startswith('RAC1169:'):
break
if l.startswith('Continuing execution'):
continue
if len(l.strip()) == 0:
continue
fmtlines.append(l)
@ -161,7 +166,8 @@ def get_dns_dracname(host=None,
def set_dns_dracname(name,
host=None,
admin_username=None, admin_password=None):
admin_username=None,
admin_password=None):
ret = __execute_ret('set iDRAC.NIC.DNSRacName {0}'.format(name),
host=host,
@ -195,7 +201,7 @@ def system_info(host=None,
return __parse_drac(cmd['stdout'])
def set_niccfg(ip=None, subnet=None, gateway=None, dhcp=False,
def set_niccfg(ip=None, netmask=None, gateway=None, dhcp=False,
host=None,
admin_username=None,
admin_password=None,
@ -255,10 +261,10 @@ def network_info(host=None,
cmd['stdout'] = 'Problem getting switch inventory'
return cmd
if module not in inv.get('switch'):
if module not in inv.get('switch') and module not in inv.get('server'):
cmd = {}
cmd['retcode'] = -1
cmd['stdout'] = 'No switch {0} found.'.format(module)
cmd['stdout'] = 'No module {0} found.'.format(module)
return cmd
cmd = __execute_ret('getniccfg', host=host,
@ -1426,3 +1432,5 @@ def update_firmware_nfs_or_cifs(filename, share,
else:
raise CommandExecutionError('Unable to find firmware file {0}'
.format(filename))
# def get_idrac_nic()

139
salt/states/dellchassis.py
View File

@ -53,39 +53,39 @@ data in pillar. Here's an example pillar structure:
blade1:
idrac_password: saltstack1
ipmi_over_lan: True
ip: 172.17.17.1
gateway: 255.255.0.0
netmask: 172.17.255.255
ip: 172.17.17.132
netmask: 255.255.0.0
gateway: 172.17.17.1
blade2:
idrac_password: saltstack1
ipmi_over_lan: True
ip: 172.17.17.2
gateway: 255.255.0.0
netmask: 172.17.255.255
netmask: 255.255.0.0
gateway: 172.17.17.1
blade3:
idrac_password: saltstack1
ipmi_over_lan: True
ip: 172.17.17.2
gateway: 255.255.0.0
netmask: 172.17.255.255
ip: 172.17.17.20
netmask: 255.255.0.0
gateway: 172.17.17.1
blade4:
idrac_password: saltstack1
ipmi_over_lan: True
ip: 172.17.17.2
gateway: 255.255.0.0
netmask: 172.17.255.255
netmask: 255.255.0.0
gateway: 172.17.17.1
switches:
switch-1:
ip: 192.168.1.2
netmask: 255.255.255.0
broadcast: 192.168.1.255
gateway: 192.168.1.1
snmp: nonpublic
password: saltstack1
switch-2:
ip: 192.168.1.3
netmask: 255.255.255.0
broadcast: 192.168.1.255
gateway: 192.168.1.1
snmp: nonpublic
password: saltstack1
@ -135,6 +135,11 @@ pillar stated above:
salt '*' state.sls my-dell-chasis-state-name -t 60
.. note::
The Dell CMC units perform adequately but many iDRACs are **excruciatingly**
slow. Some functions can take minutes to execute.
'''
# Import python libs
@ -154,7 +159,7 @@ def __virtual__():
def blade_idrac(name, idrac_password=None, idrac_ipmi=None,
idrac_ip=None, idrac_netmask=None, idrac_gateway=None,
idrac_dnsname=None,
drac_dhcp=None):
idrac_dhcp=None):
'''
Set parameters for iDRAC in a blade.
@ -163,9 +168,12 @@ def blade_idrac(name, idrac_password=None, idrac_ipmi=None,
:param idrac_ip: Set IP address for iDRAC
:param idrac_netmask: Set netmask for iDRAC
:param idrac_gateway: Set gateway for iDRAC
:param drac_dhcp: Turn on DHCP for iDRAC (True turns on, False does nothing
:param idrac_dhcp: Turn on DHCP for iDRAC (True turns on, False does nothing
becaause setting a static IP will disable DHCP).
:return: A standard Salt changes dictionary
NOTE: If any of the IP address settings is configured, all of ip, netmask,
and gateway must be present
'''
ret = {'name': name,
@ -174,32 +182,119 @@ def blade_idrac(name, idrac_password=None, idrac_ipmi=None,
'comment': ''}
if not idrac_password:
password = __pillar__['proxy']['admin_password']
(username, password) = __salt__['chassis.chassis_credentials']()
else:
password = idrac_password
if idrac_ipmi:
if idrac_ipmi is True:
module_network = __salt__['chassis.cmd']('network_info', module=name)
current_idrac_ip = module_network['Network']['IP Address']
if idrac_ipmi is not None:
if idrac_ipmi is True or idrac_ipmi == 1:
idrac_ipmi = '1'
if idrac_ipmi is False:
if idrac_ipmi is False or idrac_ipmi == 0:
idrac_ipmi = '0'
current_ipmi = __salt__['dracr.get_general']('cfgIpmiLan', 'cfgIpmiLanEnable',
host=idrac_ip, admin_username='root',
host=current_idrac_ip, admin_username='root',
admin_password=password)
if current_ipmi != idrac_ipmi:
ch = {'Old': current_ipmi, 'New': idrac_ipmi}
ret['changes']['IPMI'] = ch
if idrac_dnsname:
dnsret = __salt__['dracr.get_dns_dracname'](host=idrac_ip, admin_username='root',
if idrac_dnsname is not None:
dnsret = __salt__['dracr.get_dns_dracname'](host=current_idrac_ip,
admin_username='root',
admin_password=password)
current_dnsname = dnsret['Key=iDRAC.Embedded.1#NIC.1']['DNSRacName']
current_dnsname = dnsret['[Key=iDRAC.Embedded.1#NIC.1]']['DNSRacName']
if current_dnsname != idrac_dnsname:
ch = {'Old': current_dnsname,
'New': idrac_dnsname}
ret['changes']['DNSRacName'] = ch
if idrac_dhcp is not None or idrac_ip or idrac_netmask or idrac_gateway:
if idrac_dhcp is True or idrac_dhcp == 1:
idrac_dhcp = 1
else:
idrac_dhcp = 0
if str(module_network['Network']['DHCP Enabled']) == '0' and idrac_dhcp == 1:
ch = {'Old': module_network['Network']['DHCP Enabled'],
'New': idrac_dhcp}
ret['changes']['DRAC DHCP'] = ch
if idrac_dhcp == 0 and all([idrac_ip, idrac_netmask, idrac_netmask]):
current_network = __salt__['chassis.cmd']('network_info',
module=name)
old_ipv4 = {}
new_ipv4 = {}
if current_network['Network']['IP Address'] != idrac_ip:
old_ipv4['ip'] = current_network['Network']['IP Address']
new_ipv4['ip'] = idrac_ip
if current_network['Network']['Subnet Mask'] != idrac_netmask:
old_ipv4['netmask'] = current_network['Network']['Subnet Mask']
new_ipv4['netmask'] = idrac_netmask
if current_network['Network']['Gateway'] != idrac_gateway:
old_ipv4['gateway'] = current_network['Network']['Gateway']
new_ipv4['gateway'] = idrac_gateway
if new_ipv4 != {}:
ret['changes']['Network'] = {}
ret['changes']['Network']['Old'] = old_ipv4
ret['changes']['Network']['New'] = new_ipv4
if ret['changes'] == {}:
ret['comment'] = 'iDRAC on blade is already in the desired state.'
return ret
if __opts__['test'] and ret['changes'] != {}:
ret['result'] = None
ret['comment'] = 'iDRAC on blade will change.'
return ret
if 'IPMI' in ret['changes']:
ipmi_result = __salt__['dracr.set_general']('cfgIpmiLan',
'cfgIpmiLanEnable',
idrac_ipmi,
host=current_idrac_ip,
admin_username='root',
admin_password=password)
if not ipmi_result:
ret['result'] = False
ret['changes']['IPMI']['success'] = False
if 'DNSRacName' in ret['changes']:
dnsracname_result = __salt__['dracr.set_dns_dracname'](idrac_dnsname,
host=current_idrac_ip,
admin_username='root',
admin_password=password)
if dnsracname_result['retcode'] == 0:
ret['changes']['DNSRacName']['success'] = True
else:
ret['result'] = False
ret['changes']['DNSRacName']['success'] = False
ret['changes']['DNSRacName']['return'] = dnsracname_result
if 'DRAC DHCP' in ret['changes']:
dhcp_result = __salt__['chassis.cmd']('set_niccfg', dhcp=idrac_dhcp)
if dhcp_result['retcode']:
ret['changes']['DRAC DHCP']['success'] = True
else:
ret['result'] = False
ret['changes']['DRAC DHCP']['success'] = False
ret['changes']['DRAC DHCP']['return'] = dhcp_result
if 'Network' in ret['changes']:
network_result = __salt__['chassis.cmd']('set_niccfg', ip=idrac_ip,
netmask=idrac_netmask,
gateway=idrac_gateway,
module=name)
if network_result['retcode'] == 0:
ret['changes']['Network']['success'] = True
else:
ret['result'] = False
ret['changes']['Network']['success'] = False
ret['changes']['Network']['return'] = network_result
return ret