mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Wrong Setup function was being used, which could result in failure if new global options were used. (#52862)
* Revert "changes to clusteR" This reverts commit 33ee1b71e4bc8435fb315762a871f8c4cb6c5f80. * Revert "changes to clusteR" This reverts commit 33ee1b71e4bc8435fb315762a871f8c4cb6c5f80. * Revert "Revert "changes to clusteR"" This reverts commit f1104a37b42886aebb4d2b2ab27c91c96d97858a. * Revert "Revert "changes to clusteR"" This reverts commit f1104a37b42886aebb4d2b2ab27c91c96d97858a. * Fix setup bug
This commit is contained in:
parent
1e776c34a2
commit
ab22ea1a66
4 changed files with 4 additions and 5 deletions
|
@ -147,7 +147,7 @@ class NetAppONTAPasup(object):
|
|||
if HAS_NETAPP_LIB is False:
|
||||
self.module.fail_json(msg="the python NetApp-Lib module is required")
|
||||
else:
|
||||
self.server = netapp_utils.setup_ontap_zapi(module=self.module)
|
||||
self.server = netapp_utils.setup_na_ontap_zapi(module=self.module)
|
||||
|
||||
def set_playbook_zapi_key_map(self):
|
||||
self.na_helper.zapi_string_keys = {
|
||||
|
|
|
@ -171,8 +171,7 @@ class NetAppONTAPFlexCache(object):
|
|||
if HAS_NETAPP_LIB is False:
|
||||
self.module.fail_json(msg="the python NetApp-Lib module is required")
|
||||
else:
|
||||
self.server = netapp_utils.setup_ontap_zapi(module=self.module,
|
||||
vserver=self.parameters['vserver'])
|
||||
self.server = netapp_utils.setup_na_ontap_zapi(module=self.module, vserver=self.parameters['vserver'])
|
||||
|
||||
def add_parameter_to_dict(self, adict, name, key=None, tostr=False):
|
||||
''' add defined parameter (not None) to adict using key '''
|
||||
|
|
|
@ -261,7 +261,7 @@ class NetAppONTAPJob(object):
|
|||
:return: None
|
||||
"""
|
||||
results = netapp_utils.get_cserver(self.server)
|
||||
cserver = netapp_utils.setup_ontap_zapi(module=self.module, vserver=results)
|
||||
cserver = netapp_utils.setup_na_ontap_zapi(module=self.module, vserver=results)
|
||||
netapp_utils.ems_log_event("na_ontap_job_schedule", cserver)
|
||||
|
||||
def apply(self):
|
||||
|
|
|
@ -269,7 +269,7 @@ class NetAppONTAPSnapmirror(object):
|
|||
if self.parameters.get('source_password'):
|
||||
self.module.params['password'] = self.parameters['source_password']
|
||||
self.module.params['hostname'] = self.parameters['source_hostname']
|
||||
self.source_server = netapp_utils.setup_ontap_zapi(module=self.module)
|
||||
self.source_server = netapp_utils.setup_na_ontap_zapi(module=self.module)
|
||||
|
||||
def delete_snapmirror(self):
|
||||
"""
|
||||
|
|
Loading…
Reference in a new issue