mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Add datacenter getter/setter, change 'dell_switch' to just 'switch', trap call to change_password.
This commit is contained in:
C. R. Oldham
parent
4c8cd064a4
commit
4bcb5a508b
3 changed files with 210 additions and 11 deletions
|
|
@ -1090,7 +1090,6 @@ def inventory(host=None, admin_username=None, admin_password=None):
|
|||
|
||||
return ret
|
||||
|
||||
|
||||
def set_chassis_location(location,
|
||||
host=None,
|
||||
admin_username=None,
|
||||
|
|
@ -1147,8 +1146,67 @@ def get_chassis_location(host=None,
|
|||
|
||||
'''
|
||||
return system_info(host=host,
|
||||
admin_username=admin_username,
|
||||
admin_password=admin_password)['Chassis Information']['Chassis Location']
|
||||
admin_username=admin_username,
|
||||
admin_password=admin_password)['Chassis Information'] \
|
||||
['Chassis Location']
|
||||
|
||||
def set_chassis_datacenter(location,
|
||||
host=None,
|
||||
admin_username=None,
|
||||
admin_password=None):
|
||||
'''
|
||||
Set the location of the chassis.
|
||||
|
||||
location
|
||||
The name of the datacenter to be set on the chassis.
|
||||
|
||||
host
|
||||
The chassis host.
|
||||
|
||||
admin_username
|
||||
The username used to access the chassis.
|
||||
|
||||
admin_password
|
||||
The password used to access the chassis.
|
||||
|
||||
CLI Example:
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
salt '*' dracr.set_chassis_datacenter datacenter-name host=111.222.333.444
|
||||
admin_username=root admin_password=secret
|
||||
|
||||
'''
|
||||
return set_general('cfgLocation', 'cfgLocationDatacenter', location,
|
||||
host=host, admin_username=admin_username,
|
||||
admin_password=admin_password)
|
||||
|
||||
|
||||
def get_chassis_datacenter(host=None,
|
||||
admin_username=None,
|
||||
admin_password=None):
|
||||
'''
|
||||
Get the datacenter of the chassis.
|
||||
|
||||
host
|
||||
The chassis host.
|
||||
|
||||
admin_username
|
||||
The username used to access the chassis.
|
||||
|
||||
admin_password
|
||||
The password used to access the chassis.
|
||||
|
||||
CLI Example:
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
salt '*' dracr.set_chassis_location host=111.222.333.444
|
||||
admin_username=root admin_password=secret
|
||||
|
||||
'''
|
||||
return get_general('cfgLocation', 'cfgLocationDatacenter', host=host,
|
||||
admin_username=admin_username, admin_password=admin_password)
|
||||
|
||||
|
||||
def set_general(cfg_sec, cfg_var, val, host=None,
|
||||
|
|
|
|||
|
|
@ -217,6 +217,13 @@ def chconfig(cmd, *args, **kwargs):
|
|||
for k in kwargs.keys():
|
||||
if k.startswith('__pub_'):
|
||||
kwargs.pop(k)
|
||||
|
||||
# Catch password reset
|
||||
if cmd == 'change_password':
|
||||
if 'username' in kwargs:
|
||||
DETAILS['admin_username'] = kwargs['username']
|
||||
if 'password' in kwargs:
|
||||
DETAILS['admin_password'] = kwargs['password']
|
||||
if 'dracr.'+cmd not in __salt__:
|
||||
return {'retcode': -1, 'message': 'dracr.' + cmd + ' is not available'}
|
||||
else:
|
||||
|
|
|
|||
|
|
@ -4,13 +4,14 @@ Manage chassis via Salt Proxies.
|
|||
|
||||
.. versionadded:: 2015.8.2
|
||||
|
||||
Example managing a Dell chassis:
|
||||
Below is an example state that sets parameters just to show the basics.
|
||||
|
||||
.. code-block:: yaml
|
||||
|
||||
my-dell-chassis:
|
||||
chassis.dell:
|
||||
dellchassis.chassis:
|
||||
- name: my-dell-chassis
|
||||
- datacenter: dc-1-us
|
||||
- location: my-location
|
||||
- mode: 2
|
||||
- idrac_launch: 1
|
||||
|
|
@ -22,6 +23,112 @@ Example managing a Dell chassis:
|
|||
- server-2: off
|
||||
- server-3: powercycle
|
||||
|
||||
However, it is possible to place the entire set of chassis configuration
|
||||
data in pillar. Here's an example pillar
|
||||
structure:
|
||||
|
||||
.. code-block:: yaml
|
||||
|
||||
proxy:
|
||||
host: 10.27.20.18
|
||||
admin_username: root
|
||||
admin_password: saltstack
|
||||
proxytype: fx2
|
||||
|
||||
chassis:
|
||||
name: fx2-1
|
||||
username: root
|
||||
password: saltstack1
|
||||
datacenter: london
|
||||
location: rack-1-shelf-3
|
||||
management_mode: 2
|
||||
idrac_launch: 0
|
||||
slot_names:
|
||||
1: blade1
|
||||
2: blade2
|
||||
|
||||
blades:
|
||||
blade1:
|
||||
idrac_password: saltstack1
|
||||
ipmi_over_lan: True
|
||||
ip: 172.17.17.1
|
||||
subnet: 255.255.0.0
|
||||
netmask: 172.17.255.255
|
||||
blade2:
|
||||
idrac_password: saltstack1
|
||||
ipmi_over_lan: True
|
||||
ip: 172.17.17.2
|
||||
subnet: 255.255.0.0
|
||||
netmask: 172.17.255.255
|
||||
blade3:
|
||||
idrac_password: saltstack1
|
||||
ipmi_over_lan: True
|
||||
ip: 172.17.17.2
|
||||
subnet: 255.255.0.0
|
||||
netmask: 172.17.255.255
|
||||
blade4:
|
||||
idrac_password: saltstack1
|
||||
ipmi_over_lan: True
|
||||
ip: 172.17.17.2
|
||||
subnet: 255.255.0.0
|
||||
netmask: 172.17.255.255
|
||||
|
||||
switches:
|
||||
switch-1:
|
||||
ip: 192.168.1.2
|
||||
netmask: 255.255.255.0
|
||||
broadcast: 192.168.1.255
|
||||
snmp: nonpublic
|
||||
password: saltstack1
|
||||
switch-2:
|
||||
ip: 192.168.1.3
|
||||
netmask: 255.255.255.0
|
||||
broadcast: 192.168.1.255
|
||||
snmp: nonpublic
|
||||
password: saltstack1
|
||||
|
||||
And to go with it, here's an example state that pulls the data from pillar
|
||||
|
||||
.. code-block:: yaml
|
||||
|
||||
{% set details = pillar['chassis'] with context %}
|
||||
standup-step1:
|
||||
dellchassis.chassis:
|
||||
- name: {{ details['name'] }}
|
||||
- location: {{ details['location'] }}
|
||||
- mode: {{ details['management_mode'] }}
|
||||
- idrac_launch: {{ details['idrac_launch'] }}
|
||||
- slot_names
|
||||
{% for k, v in details['chassis']['slot_names'].iteritems() %}
|
||||
- {{ k }}: {{ v }}
|
||||
{% endfor %}
|
||||
|
||||
|
||||
{% for k, v in details['chassis']['switches'].iteritems() %}
|
||||
standup-switches-{{ k }}:
|
||||
dellchassis.dell_switch:
|
||||
- name: {{ k }}
|
||||
- ip: {{ v['ip'] }}
|
||||
- netmask: {{ v['netmask'] }}
|
||||
- gateway: {{ v['gateway'] }}
|
||||
- password: {{ v['password'] }}
|
||||
- snmp: {{ v['snmp'] }}
|
||||
{% endfor %}
|
||||
|
||||
dellchassis
|
||||
{% for k, v in details['chassis']['slot_names'].iteritems() %}
|
||||
|
||||
- {{ k }}: {{ v }}
|
||||
{% endfor %}
|
||||
|
||||
blade_powercycle:
|
||||
chassis.dell_chassis:
|
||||
- blade_power_states:
|
||||
- server-1: powercycle
|
||||
- server-2: powercycle
|
||||
- server-3: powercycle
|
||||
- server-4: powercycle
|
||||
|
||||
'''
|
||||
|
||||
# Import python libs
|
||||
|
|
@ -55,17 +162,24 @@ def blade_idrac(name, idrac_password=None, idrac_ipmi=None,
|
|||
pass
|
||||
|
||||
|
||||
def chassis(name, location=None, mode=None, idrac_launch=None, slot_names=None,
|
||||
blade_power_states=None):
|
||||
def chassis(name, password=None, datacenter=None,
|
||||
location=None, mode=None, idrac_launch=None, slot_names=None,
|
||||
blade_power_states=None):
|
||||
'''
|
||||
Manage a Dell Chassis.
|
||||
|
||||
name
|
||||
The name of the chassis.
|
||||
|
||||
datacenter
|
||||
The datacenter in which the chassis is located
|
||||
|
||||
location
|
||||
The location of the chassis.
|
||||
|
||||
password
|
||||
Password for the chassis
|
||||
|
||||
mode
|
||||
The management mode of the chassis. Viable options are:
|
||||
|
||||
|
|
@ -96,9 +210,10 @@ def chassis(name, location=None, mode=None, idrac_launch=None, slot_names=None,
|
|||
.. code-block:: yaml
|
||||
|
||||
my-dell-chassis:
|
||||
chassis.dell:
|
||||
dellchassis.chassis:
|
||||
- name: my-dell-chassis
|
||||
- location: my-location
|
||||
- datacenter: london
|
||||
- mode: 2
|
||||
- idrac_launch: 1
|
||||
- slot_names:
|
||||
|
|
@ -119,12 +234,25 @@ def chassis(name, location=None, mode=None, idrac_launch=None, slot_names=None,
|
|||
mode_cmd = 'cfgRacTuneChassisMgmtAtServer'
|
||||
launch_cmd = 'cfgRacTuneIdracDNSLaunchEnable'
|
||||
|
||||
if idrac_launch:
|
||||
idrac_launch = str(idrac_launch)
|
||||
|
||||
current_name = __salt__[chassis_cmd]('get_chassis_name')
|
||||
if name != current_name:
|
||||
ret['changes'].update({'Name':
|
||||
{'Old': current_name,
|
||||
'New': name}})
|
||||
|
||||
current_dc = __salt__[chassis_cmd]('get_chassis_datacenter')
|
||||
if datacenter != current_dc:
|
||||
ret['changes'].update({'Datacenter':
|
||||
{'Old': current_dc,
|
||||
'New': datacenter}})
|
||||
|
||||
if password:
|
||||
ret['changes'].update({'Password':
|
||||
{ 'Old': '******',
|
||||
'New': '******'}})
|
||||
if location:
|
||||
current_location = __salt__[chassis_cmd]('get_chassis_location')
|
||||
if location != current_location:
|
||||
|
|
@ -159,7 +287,7 @@ def chassis(name, location=None, mode=None, idrac_launch=None, slot_names=None,
|
|||
ret['changes']['Slot Names']['Old'].update(old)
|
||||
ret['changes']['Slot Names']['New'].update(new)
|
||||
|
||||
# TODO: Refactor this and make DRY - can probable farm this out to a new funciton
|
||||
# TODO: Refactor this and make DRY - can probable farm this out to a new function
|
||||
if blade_power_states:
|
||||
# TODO: Get the power state list working
|
||||
current_power_states = 'get a list of current power states'
|
||||
|
|
@ -190,6 +318,12 @@ def chassis(name, location=None, mode=None, idrac_launch=None, slot_names=None,
|
|||
name = __salt__[chassis_cmd]('set_chassis_name', name)
|
||||
if location:
|
||||
location = __salt__[chassis_cmd]('set_chassis_location', location)
|
||||
if password:
|
||||
pw_result = __salt__[chassis_cmd]('change_password', username='root',
|
||||
password=password)
|
||||
if datacenter:
|
||||
datacenter_result = __salt__[chassis_cmd]('set_chassis_datacenter',
|
||||
datacenter)
|
||||
if mode:
|
||||
mode = __salt__[chassis_cmd]('set_general', cfg_tuning, mode_cmd, mode)
|
||||
if idrac_launch:
|
||||
|
|
@ -212,7 +346,7 @@ def chassis(name, location=None, mode=None, idrac_launch=None, slot_names=None,
|
|||
return ret
|
||||
|
||||
|
||||
def dell_switch(name, ip=None, netmask=None, gateway=None, dhcp=None,
|
||||
def switch(name, ip=None, netmask=None, gateway=None, dhcp=None,
|
||||
password=None, snmp=None):
|
||||
'''
|
||||
Manage switches in a Dell Chassis.
|
||||
|
|
@ -245,7 +379,7 @@ def dell_switch(name, ip=None, netmask=None, gateway=None, dhcp=None,
|
|||
.. code-block:: yaml
|
||||
|
||||
my-dell-chassis:
|
||||
chassis.dell_switch:
|
||||
dellchassis.dell_switch:
|
||||
- switch: switch-1
|
||||
- ip: 192.168.1.1
|
||||
- netmask: 255.255.255.0
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue