From 884ae8b96e2f4951a1fded8a947936da46e614c3 Mon Sep 17 00:00:00 2001 From: CaptTrews Date: Fri, 1 Nov 2019 07:25:16 +0000 Subject: Updated from network content collector Signed-off-by: CaptTrews --- plugins/module_utils/network/vyos/vyos.py | 9 --------- plugins/modules/vyos_user.py | 10 +--------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/plugins/module_utils/network/vyos/vyos.py b/plugins/module_utils/network/vyos/vyos.py index c578dd5..1d2c508 100644 --- a/plugins/module_utils/network/vyos/vyos.py +++ b/plugins/module_utils/network/vyos/vyos.py @@ -48,15 +48,6 @@ vyos_provider_spec = { vyos_argument_spec = { "provider": dict(type="dict", options=vyos_provider_spec) } -vyos_top_spec = { - "host": dict(removed_in_version=2.9), - "port": dict(removed_in_version=2.9, type="int"), - "username": dict(removed_in_version=2.9), - "password": dict(removed_in_version=2.9, no_log=True), - "ssh_keyfile": dict(removed_in_version=2.9, type="path"), - "timeout": dict(removed_in_version=2.9, type="int"), -} -vyos_argument_spec.update(vyos_top_spec) def get_provider_argspec(): diff --git a/plugins/modules/vyos_user.py b/plugins/modules/vyos_user.py index eb71c58..5a766ee 100644 --- a/plugins/modules/vyos_user.py +++ b/plugins/modules/vyos_user.py @@ -326,15 +326,7 @@ def main(): ) warnings = list() - if module.params["password"] and not module.params["configured_password"]: - warnings.append( - 'The "password" argument is used to authenticate the current connection. ' - + 'To set a user password use "configured_password" instead.' - ) - - result = {"changed": False} - if warnings: - result["warnings"] = warnings + result = {"changed": False, "warnings": warnings} want = map_params_to_obj(module) have = config_to_dict(module) -- cgit v1.2.3