From 2077e32ddd03dca4517496d56cd24c3f861afbe8 Mon Sep 17 00:00:00 2001 From: Nathaniel Case Date: Mon, 12 Sep 2016 11:19:09 -0400 Subject: [PATCH] Vyos cleanup Addresses #17416 --- lib/ansible/module_utils/shell.py | 2 +- lib/ansible/module_utils/vyos.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/ansible/module_utils/shell.py b/lib/ansible/module_utils/shell.py index a2738d481d9..87f9491f23b 100644 --- a/lib/ansible/module_utils/shell.py +++ b/lib/ansible/module_utils/shell.py @@ -262,7 +262,7 @@ class CliBase(object): def get_config(self, commands): raise NotImplementedError - def load_config(self, commands): + def load_config(self, commands, **kwargs): raise NotImplementedError def save_config(self): diff --git a/lib/ansible/module_utils/vyos.py b/lib/ansible/module_utils/vyos.py index 5b629650b36..a47bd89eb24 100644 --- a/lib/ansible/module_utils/vyos.py +++ b/lib/ansible/module_utils/vyos.py @@ -66,10 +66,10 @@ class Cli(CliBase): response = self.execute(commands) return response[1:-2] - def load_config(self, config, commit=False, comment=None, save=False): + def load_config(self, config, commit=False, comment=None, save=False, **kwargs): try: config.insert(0, 'configure') - response = self.execute(config) + self.execute(config) except NetworkError: # discard any changes in case of failure self.execute(['exit discard'])