From 14dbb3c47d698222f7616ddda4afac78e988024b Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 17 Jan 2018 13:41:05 +0100 Subject: [PATCH] library: make Cmd.create() independent of AnsibleUtil Instead, pass the provider parameter. --- library/network_connections.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/library/network_connections.py b/library/network_connections.py index efb7b57..3a64b56 100755 --- a/library/network_connections.py +++ b/library/network_connections.py @@ -2187,13 +2187,12 @@ AnsibleUtil = _AnsibleUtil() class Cmd: @staticmethod - def create(): - provider = AnsibleUtil.params['provider'] + def create(provider): if provider == 'nm': return Cmd_nm() elif provider == 'initscripts': return Cmd_initscripts() - AnsibleUtil.fail_json('unsupported provider %s' % (provider)) + raise MyError('unsupported provider %s' % (provider)) def run(self): for idx, connection in enumerate(AnsibleUtil.connections): @@ -2601,8 +2600,8 @@ class Cmd_initscripts(Cmd): if __name__ == '__main__': try: - Cmd.create().run() + Cmd.create(AnsibleUtil.params['provider']).run() except Exception as e: AnsibleUtil.fail_json('fatal error: %s' % (e), - warn_traceback = True) + warn_traceback = not isinstance(e, MyError)) AnsibleUtil.exit_json()