|
|
|
@ -1,21 +1,8 @@
|
|
|
|
|
#
|
|
|
|
|
# (c) 2016 Red Hat Inc.
|
|
|
|
|
#
|
|
|
|
|
# This file is part of Ansible
|
|
|
|
|
#
|
|
|
|
|
# Ansible is free software: you can redistribute it and/or modify
|
|
|
|
|
# it under the terms of the GNU General Public License as published by
|
|
|
|
|
# the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
# (at your option) any later version.
|
|
|
|
|
#
|
|
|
|
|
# Ansible is distributed in the hope that it will be useful,
|
|
|
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
# GNU General Public License for more details.
|
|
|
|
|
#
|
|
|
|
|
# You should have received a copy of the GNU General Public License
|
|
|
|
|
# along with Ansible. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
#
|
|
|
|
|
# Copyright: (c) 2016, Red Hat Inc.
|
|
|
|
|
|
|
|
|
|
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
|
|
|
|
|
|
|
|
|
|
from __future__ import (absolute_import, division, print_function)
|
|
|
|
|
__metaclass__ = type
|
|
|
|
|
|
|
|
|
@ -83,7 +70,7 @@ class ActionModule(_ActionModule):
|
|
|
|
|
elif self._play_context.connection in ('netconf', 'network_cli'):
|
|
|
|
|
provider = self._task.args.get('provider', {})
|
|
|
|
|
if any(provider.values()):
|
|
|
|
|
display.warning('provider is unnessary whene using %s and will be ignored' % self._play_context.connection)
|
|
|
|
|
display.warning('provider is unnecessary when using %s and will be ignored' % self._play_context.connection)
|
|
|
|
|
del self._task.args['provider']
|
|
|
|
|
|
|
|
|
|
if (self._play_context.connection == 'network_cli' and self._task.action not in CLI_SUPPORTED_MODULES) or \
|
|
|
|
@ -93,7 +80,7 @@ class ActionModule(_ActionModule):
|
|
|
|
|
|
|
|
|
|
if (self._play_context.connection == 'local' and transport == 'cli' and self._task.action in CLI_SUPPORTED_MODULES) \
|
|
|
|
|
or self._play_context.connection == 'network_cli':
|
|
|
|
|
# make sure we are in the right cli context whitch should be
|
|
|
|
|
# make sure we are in the right cli context which should be
|
|
|
|
|
# enable mode and not config module
|
|
|
|
|
if socket_path is None:
|
|
|
|
|
socket_path = self._connection.socket_path
|
|
|
|
|