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

Fixes #23388 Network provider masks too much (#23418) (#23424)

Browse source 
* Fixes #23388 Network provider masks too much

* Fix trailing whitespace
This commit is contained in:
Chris Alfonso 2017-04-07 14:39:09 -06:00 committed by GitHub
parent 0fe53eda86
commit b9ee5aae81
14 changed files with 75 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/module_utils/eos.py
View file

@ -53,7 +53,7 @@ eos_argument_spec = {
'validate_certs': dict(type='bool', default=True),
'timeout': dict(type='int'),
'provider': dict(type='dict', no_log=True),
'provider': dict(type='dict'),
'transport': dict(choices=['cli', 'eapi'])
}

2
lib/ansible/module_utils/ios.py
View file

@ -40,7 +40,7 @@ ios_argument_spec = {
'authorize': dict(fallback=(env_fallback, ['ANSIBLE_NET_AUTHORIZE']), type='bool'),
'auth_pass': dict(fallback=(env_fallback, ['ANSIBLE_NET_AUTH_PASS']), no_log=True),
'timeout': dict(type='int'),
'provider': dict(type='dict', no_log=True),
'provider': dict(type='dict'),
}
def check_args(module, warnings):

2
lib/ansible/module_utils/iosxr.py
View file

@ -39,7 +39,7 @@ iosxr_argument_spec = {
'password': dict(fallback=(env_fallback, ['ANSIBLE_NET_PASSWORD']), no_log=True),
'ssh_keyfile': dict(fallback=(env_fallback, ['ANSIBLE_NET_SSH_KEYFILE']), type='path'),
'timeout': dict(type='int'),
'provider': dict(type='dict', no_log=True)
'provider': dict(type='dict')
}
def check_args(module, warnings):

2
lib/ansible/module_utils/junos.py
View file

@ -37,7 +37,7 @@ junos_argument_spec = {
'password': dict(fallback=(env_fallback, ['ANSIBLE_NET_PASSWORD']), no_log=True),
'ssh_keyfile': dict(fallback=(env_fallback, ['ANSIBLE_NET_SSH_KEYFILE']), type='path'),
'timeout': dict(type='int', default=10),
'provider': dict(type='dict', no_log=True),
'provider': dict(type='dict'),
'transport': dict()
}

2
lib/ansible/module_utils/vyos.py
View file

@ -40,7 +40,7 @@ vyos_argument_spec = {
'ssh_keyfile': dict(fallback=(env_fallback, ['ANSIBLE_NET_SSH_KEYFILE']), type='path'),
'timeout': dict(type='int'),
'provider': dict(type='dict', no_log=True),
'provider': dict(type='dict'),
}
def check_args(module, warnings):

9
lib/ansible/plugins/action/dellos10.py
View file

@ -92,7 +92,14 @@ class ActionModule(_ActionModule):
self._play_context.become = False
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):
ssh = connection_loader.get('ssh', class_only=True)

10
lib/ansible/plugins/action/dellos6.py
View file

@ -87,7 +87,15 @@ class ActionModule(_ActionModule):
if self._play_context.become_method == 'enable':
self._play_context.become = False
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):
ssh = connection_loader.get('ssh', class_only=True)

9
lib/ansible/plugins/action/dellos9.py
View file

@ -92,7 +92,14 @@ class ActionModule(_ActionModule):
self._play_context.become = False
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):
ssh = connection_loader.get('ssh', class_only=True)

9
lib/ansible/plugins/action/eos.py
View file

@ -116,7 +116,14 @@ class ActionModule(_ActionModule):
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):
ssh = connection_loader.get('ssh', class_only=True)

9
lib/ansible/plugins/action/ios.py
View file

@ -86,7 +86,14 @@ class ActionModule(_ActionModule):
self._play_context.become = False
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):
ssh = connection_loader.get('ssh', class_only=True)

5
lib/ansible/plugins/action/iosxr.py
View file

@ -84,6 +84,11 @@ class ActionModule(_ActionModule):
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):

9
lib/ansible/plugins/action/junos.py
View file

@ -101,7 +101,14 @@ class ActionModule(_ActionModule):
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):
ssh = connection_loader.get('ssh', class_only=True)

9
lib/ansible/plugins/action/sros.py
View file

@ -78,7 +78,14 @@ class ActionModule(_ActionModule):
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):
ssh = connection_loader.get('ssh', class_only=True)

9
lib/ansible/plugins/action/vyos.py
View file

@ -79,7 +79,14 @@ class ActionModule(_ActionModule):
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):
ssh = connection_loader.get('ssh', class_only=True)