cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update purefa_facts to show details on connected arrays (#60368)

Browse source
This commit is contained in:
Simon Dodsley 2019-08-15 06:30:30 +02:00 committed by ansibot
parent 535ef2e5ec
commit c2160274c6
1 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
lib/ansible/modules/storage/purestorage/purefa_facts.py
View file

@ -30,7 +30,7 @@ options:
- When supplied, this argument will define the facts to be collected. - When supplied, this argument will define the facts to be collected.
Possible values for this include all, minimum, config, performance, Possible values for this include all, minimum, config, performance,
capacity, network, subnet, interfaces, hgroups, pgroups, hosts, capacity, network, subnet, interfaces, hgroups, pgroups, hosts,
admins, volumes, snapshots, pods, vgroups, offload and apps. admins, volumes, snapshots, pods, vgroups, offload, apps and arrays.
type: list type: list
required: false required: false
default: minimum default: minimum
@ -343,6 +343,7 @@ CAP_REQUIRED_API_VERSION = '1.6'
SAN_REQUIRED_API_VERSION = '1.10' SAN_REQUIRED_API_VERSION = '1.10'
NVME_API_VERSION = '1.16' NVME_API_VERSION = '1.16'
PREFERRED_API_VERSION = '1.15' PREFERRED_API_VERSION = '1.15'
CONN_STATUS_API_VERSION = '1.17'
def generate_default_dict(array): def generate_default_dict(array):
@ -667,6 +668,26 @@ def generate_pods_dict(array):
return pods_facts return pods_facts
def generate_conn_array_dict(array):
conn_array_facts = {}
api_version = array._list_available_rest_versions()
if CONN_STATUS_API_VERSION in api_version:
carrays = array.list_connected_arrays()
for carray in range(0, len(carrays)):
arrayname = carrays[carray]['array_name']
conn_array_facts[arrayname] = {
'array_id': carrays[carray]['id'],
'throtled': carrays[carray]['throtled'],
'version': carrays[carray]['version'],
'type': carrays[carray]['type'],
'mgmt_ip': carrays[carray]['management_address'],
'repl_ip': carrays[carray]['replication_address'],
}
if CONN_STATUS_API_VERSION in api_version:
conn_array_facts[arrayname]['status'] = carrays[carray]['status']
return conn_array_facts
def generate_apps_dict(array): def generate_apps_dict(array):
apps_facts = {} apps_facts = {}
api_version = array._list_available_rest_versions() api_version = array._list_available_rest_versions()
@ -780,7 +801,7 @@ def main():
valid_subsets = ('all', 'minimum', 'config', 'performance', 'capacity', valid_subsets = ('all', 'minimum', 'config', 'performance', 'capacity',
'network', 'subnet', 'interfaces', 'hgroups', 'pgroups', 'network', 'subnet', 'interfaces', 'hgroups', 'pgroups',
'hosts', 'admins', 'volumes', 'snapshots', 'pods', 'hosts', 'admins', 'volumes', 'snapshots', 'pods',
'vgroups', 'offload', 'apps') 'vgroups', 'offload', 'apps', 'arrays')
subset_test = (test in valid_subsets for test in subset) subset_test = (test in valid_subsets for test in subset)
if not all(subset_test): if not all(subset_test):
module.fail_json(msg="value must gather_subset must be one or more of: %s, got: %s" module.fail_json(msg="value must gather_subset must be one or more of: %s, got: %s"
@ -823,6 +844,8 @@ def main():
facts['s3_offload'] = generate_s3_offload_dict(array) facts['s3_offload'] = generate_s3_offload_dict(array)
if 'apps' in subset or 'all' in subset: if 'apps' in subset or 'all' in subset:
facts['apps'] = generate_apps_dict(array) facts['apps'] = generate_apps_dict(array)
if 'arrays' in subset or 'all' in subset:
facts['arrays'] = generate_conn_array_dict(array)
module.exit_json(ansible_facts={'ansible_purefa_facts': facts}) module.exit_json(ansible_facts={'ansible_purefa_facts': facts})