* Fixes #23388 Network provider masks too much * Fix trailing whitespace
This commit is contained in:
parent
0fe53eda86
commit
b9ee5aae81
14 changed files with 75 additions and 13 deletions
|
@ -53,7 +53,7 @@ eos_argument_spec = {
|
||||||
'validate_certs': dict(type='bool', default=True),
|
'validate_certs': dict(type='bool', default=True),
|
||||||
'timeout': dict(type='int'),
|
'timeout': dict(type='int'),
|
||||||
|
|
||||||
'provider': dict(type='dict', no_log=True),
|
'provider': dict(type='dict'),
|
||||||
'transport': dict(choices=['cli', 'eapi'])
|
'transport': dict(choices=['cli', 'eapi'])
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -40,7 +40,7 @@ ios_argument_spec = {
|
||||||
'authorize': dict(fallback=(env_fallback, ['ANSIBLE_NET_AUTHORIZE']), type='bool'),
|
'authorize': dict(fallback=(env_fallback, ['ANSIBLE_NET_AUTHORIZE']), type='bool'),
|
||||||
'auth_pass': dict(fallback=(env_fallback, ['ANSIBLE_NET_AUTH_PASS']), no_log=True),
|
'auth_pass': dict(fallback=(env_fallback, ['ANSIBLE_NET_AUTH_PASS']), no_log=True),
|
||||||
'timeout': dict(type='int'),
|
'timeout': dict(type='int'),
|
||||||
'provider': dict(type='dict', no_log=True),
|
'provider': dict(type='dict'),
|
||||||
}
|
}
|
||||||
|
|
||||||
def check_args(module, warnings):
|
def check_args(module, warnings):
|
||||||
|
|
|
@ -39,7 +39,7 @@ iosxr_argument_spec = {
|
||||||
'password': dict(fallback=(env_fallback, ['ANSIBLE_NET_PASSWORD']), no_log=True),
|
'password': dict(fallback=(env_fallback, ['ANSIBLE_NET_PASSWORD']), no_log=True),
|
||||||
'ssh_keyfile': dict(fallback=(env_fallback, ['ANSIBLE_NET_SSH_KEYFILE']), type='path'),
|
'ssh_keyfile': dict(fallback=(env_fallback, ['ANSIBLE_NET_SSH_KEYFILE']), type='path'),
|
||||||
'timeout': dict(type='int'),
|
'timeout': dict(type='int'),
|
||||||
'provider': dict(type='dict', no_log=True)
|
'provider': dict(type='dict')
|
||||||
}
|
}
|
||||||
|
|
||||||
def check_args(module, warnings):
|
def check_args(module, warnings):
|
||||||
|
|
|
@ -37,7 +37,7 @@ junos_argument_spec = {
|
||||||
'password': dict(fallback=(env_fallback, ['ANSIBLE_NET_PASSWORD']), no_log=True),
|
'password': dict(fallback=(env_fallback, ['ANSIBLE_NET_PASSWORD']), no_log=True),
|
||||||
'ssh_keyfile': dict(fallback=(env_fallback, ['ANSIBLE_NET_SSH_KEYFILE']), type='path'),
|
'ssh_keyfile': dict(fallback=(env_fallback, ['ANSIBLE_NET_SSH_KEYFILE']), type='path'),
|
||||||
'timeout': dict(type='int', default=10),
|
'timeout': dict(type='int', default=10),
|
||||||
'provider': dict(type='dict', no_log=True),
|
'provider': dict(type='dict'),
|
||||||
'transport': dict()
|
'transport': dict()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -40,7 +40,7 @@ vyos_argument_spec = {
|
||||||
'ssh_keyfile': dict(fallback=(env_fallback, ['ANSIBLE_NET_SSH_KEYFILE']), type='path'),
|
'ssh_keyfile': dict(fallback=(env_fallback, ['ANSIBLE_NET_SSH_KEYFILE']), type='path'),
|
||||||
|
|
||||||
'timeout': dict(type='int'),
|
'timeout': dict(type='int'),
|
||||||
'provider': dict(type='dict', no_log=True),
|
'provider': dict(type='dict'),
|
||||||
}
|
}
|
||||||
|
|
||||||
def check_args(module, warnings):
|
def check_args(module, warnings):
|
||||||
|
|
|
@ -92,7 +92,14 @@ class ActionModule(_ActionModule):
|
||||||
self._play_context.become = False
|
self._play_context.become = False
|
||||||
self._play_context.become_method = None
|
self._play_context.become_method = None
|
||||||
|
|
||||||
return super(ActionModule, self).run(tmp, task_vars)
|
result = super(ActionModule, self).run(tmp, task_vars)
|
||||||
|
|
||||||
|
try:
|
||||||
|
del result['invocation']['module_args']['provider']
|
||||||
|
except KeyError:
|
||||||
|
pass
|
||||||
|
|
||||||
|
return result
|
||||||
|
|
||||||
def _get_socket_path(self, play_context):
|
def _get_socket_path(self, play_context):
|
||||||
ssh = connection_loader.get('ssh', class_only=True)
|
ssh = connection_loader.get('ssh', class_only=True)
|
||||||
|
|
|
@ -87,7 +87,15 @@ class ActionModule(_ActionModule):
|
||||||
if self._play_context.become_method == 'enable':
|
if self._play_context.become_method == 'enable':
|
||||||
self._play_context.become = False
|
self._play_context.become = False
|
||||||
self._play_context.become_method = None
|
self._play_context.become_method = None
|
||||||
return super(ActionModule, self).run(tmp, task_vars)
|
|
||||||
|
result = super(ActionModule, self).run(tmp, task_vars)
|
||||||
|
|
||||||
|
try:
|
||||||
|
del result['invocation']['module_args']['provider']
|
||||||
|
except KeyError:
|
||||||
|
pass
|
||||||
|
|
||||||
|
return result
|
||||||
|
|
||||||
def _get_socket_path(self, play_context):
|
def _get_socket_path(self, play_context):
|
||||||
ssh = connection_loader.get('ssh', class_only=True)
|
ssh = connection_loader.get('ssh', class_only=True)
|
||||||
|
|
|
@ -92,7 +92,14 @@ class ActionModule(_ActionModule):
|
||||||
self._play_context.become = False
|
self._play_context.become = False
|
||||||
self._play_context.become_method = None
|
self._play_context.become_method = None
|
||||||
|
|
||||||
return super(ActionModule, self).run(tmp, task_vars)
|
result = super(ActionModule, self).run(tmp, task_vars)
|
||||||
|
|
||||||
|
try:
|
||||||
|
del result['invocation']['module_args']['provider']
|
||||||
|
except KeyError:
|
||||||
|
pass
|
||||||
|
|
||||||
|
return result
|
||||||
|
|
||||||
def _get_socket_path(self, play_context):
|
def _get_socket_path(self, play_context):
|
||||||
ssh = connection_loader.get('ssh', class_only=True)
|
ssh = connection_loader.get('ssh', class_only=True)
|
||||||
|
|
|
@ -116,7 +116,14 @@ class ActionModule(_ActionModule):
|
||||||
|
|
||||||
self._task.args['provider'] = provider
|
self._task.args['provider'] = provider
|
||||||
|
|
||||||
return super(ActionModule, self).run(tmp, task_vars)
|
result = super(ActionModule, self).run(tmp, task_vars)
|
||||||
|
|
||||||
|
try:
|
||||||
|
del result['invocation']['module_args']['provider']
|
||||||
|
except KeyError:
|
||||||
|
pass
|
||||||
|
|
||||||
|
return result
|
||||||
|
|
||||||
def _get_socket_path(self, play_context):
|
def _get_socket_path(self, play_context):
|
||||||
ssh = connection_loader.get('ssh', class_only=True)
|
ssh = connection_loader.get('ssh', class_only=True)
|
||||||
|
|
|
@ -86,7 +86,14 @@ class ActionModule(_ActionModule):
|
||||||
self._play_context.become = False
|
self._play_context.become = False
|
||||||
self._play_context.become_method = None
|
self._play_context.become_method = None
|
||||||
|
|
||||||
return super(ActionModule, self).run(tmp, task_vars)
|
result = super(ActionModule, self).run(tmp, task_vars)
|
||||||
|
|
||||||
|
try:
|
||||||
|
del result['invocation']['module_args']['provider']
|
||||||
|
except KeyError:
|
||||||
|
pass
|
||||||
|
|
||||||
|
return result
|
||||||
|
|
||||||
def _get_socket_path(self, play_context):
|
def _get_socket_path(self, play_context):
|
||||||
ssh = connection_loader.get('ssh', class_only=True)
|
ssh = connection_loader.get('ssh', class_only=True)
|
||||||
|
|
|
@ -84,6 +84,11 @@ class ActionModule(_ActionModule):
|
||||||
|
|
||||||
result = super(ActionModule, self).run(tmp, task_vars)
|
result = super(ActionModule, self).run(tmp, task_vars)
|
||||||
|
|
||||||
|
try:
|
||||||
|
del result['invocation']['module_args']['provider']
|
||||||
|
except KeyError:
|
||||||
|
pass
|
||||||
|
|
||||||
return result
|
return result
|
||||||
|
|
||||||
def _get_socket_path(self, play_context):
|
def _get_socket_path(self, play_context):
|
||||||
|
|
|
@ -101,7 +101,14 @@ class ActionModule(_ActionModule):
|
||||||
|
|
||||||
task_vars['ansible_socket'] = socket_path
|
task_vars['ansible_socket'] = socket_path
|
||||||
|
|
||||||
return super(ActionModule, self).run(tmp, task_vars)
|
result = super(ActionModule, self).run(tmp, task_vars)
|
||||||
|
|
||||||
|
try:
|
||||||
|
del result['invocation']['module_args']['provider']
|
||||||
|
except KeyError:
|
||||||
|
pass
|
||||||
|
|
||||||
|
return result
|
||||||
|
|
||||||
def _get_socket_path(self, play_context):
|
def _get_socket_path(self, play_context):
|
||||||
ssh = connection_loader.get('ssh', class_only=True)
|
ssh = connection_loader.get('ssh', class_only=True)
|
||||||
|
|
|
@ -78,7 +78,14 @@ class ActionModule(_ActionModule):
|
||||||
|
|
||||||
task_vars['ansible_socket'] = socket_path
|
task_vars['ansible_socket'] = socket_path
|
||||||
|
|
||||||
return super(ActionModule, self).run(tmp, task_vars)
|
result = super(ActionModule, self).run(tmp, task_vars)
|
||||||
|
|
||||||
|
try:
|
||||||
|
del result['invocation']['module_args']['provider']
|
||||||
|
except KeyError:
|
||||||
|
pass
|
||||||
|
|
||||||
|
return result
|
||||||
|
|
||||||
def _get_socket_path(self, play_context):
|
def _get_socket_path(self, play_context):
|
||||||
ssh = connection_loader.get('ssh', class_only=True)
|
ssh = connection_loader.get('ssh', class_only=True)
|
||||||
|
|
|
@ -79,7 +79,14 @@ class ActionModule(_ActionModule):
|
||||||
|
|
||||||
task_vars['ansible_socket'] = socket_path
|
task_vars['ansible_socket'] = socket_path
|
||||||
|
|
||||||
return super(ActionModule, self).run(tmp, task_vars)
|
result = super(ActionModule, self).run(tmp, task_vars)
|
||||||
|
|
||||||
|
try:
|
||||||
|
del result['invocation']['module_args']['provider']
|
||||||
|
except KeyError:
|
||||||
|
pass
|
||||||
|
|
||||||
|
return result
|
||||||
|
|
||||||
def _get_socket_path(self, play_context):
|
def _get_socket_path(self, play_context):
|
||||||
ssh = connection_loader.get('ssh', class_only=True)
|
ssh = connection_loader.get('ssh', class_only=True)
|
||||||
|
|
Loading…
Reference in a new issue