From 98546444316f8cbfe7e51f57a2026a58e786d814 Mon Sep 17 00:00:00 2001 From: Peter Sprygada Date: Wed, 28 Sep 2016 14:36:53 -0400 Subject: [PATCH] adds overwrite kwarg to load_config in junos (#17798) The junos load_config() method supports operations of overwrite, replace and merge. This adds the missing overwrite keyword arg to load_config() so that action in junos_template can be procesed correctly. --- lib/ansible/module_utils/junos.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/ansible/module_utils/junos.py b/lib/ansible/module_utils/junos.py index 9cf36da4ce..94f2647de4 100644 --- a/lib/ansible/module_utils/junos.py +++ b/lib/ansible/module_utils/junos.py @@ -171,11 +171,17 @@ class Netconf(object): return ele def load_config(self, config, commit=False, replace=False, confirm=None, - comment=None, config_format='text'): + comment=None, config_format='text', overwrite=False): + + if all([replace, overwrite]): + self.raise_exc('setting both replace and overwrite to True is invalid') if replace: merge = False - overwrite = True + overwrite = False + elif overwrite: + merge = True + overwrite = False else: merge = True overwrite = False