diff options
Diffstat (limited to 'lib/ansible/modules/network/openswitch/ops_config.py')
| -rw-r--r-- | lib/ansible/modules/network/openswitch/ops_config.py | 31 |
1 files changed, 11 insertions, 20 deletions
diff --git a/lib/ansible/modules/network/openswitch/ops_config.py b/lib/ansible/modules/network/openswitch/ops_config.py index 58077f0888..516120521e 100644 --- a/lib/ansible/modules/network/openswitch/ops_config.py +++ b/lib/ansible/modules/network/openswitch/ops_config.py @@ -1,20 +1,11 @@ #!/usr/bin/python # -# 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: Ansible Project +# 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 + ANSIBLE_METADATA = {'metadata_version': '1.0', 'status': ['preview'], @@ -182,11 +173,12 @@ backup_path: type: string sample: /playbooks/ansible/backup/ops_config.2016-07-16@22:28:34 """ -import re +import traceback -from ansible.module_utils.basic import get_exception from ansible.module_utils.openswitch import NetworkModule, NetworkError from ansible.module_utils.netcfg import NetworkConfig, dumps +from ansible.module_utils._text import to_native + def check_args(module, warnings): if module.params['force']: @@ -304,9 +296,8 @@ def main(): try: run(module, result) - except NetworkError: - exc = get_exception() - module.fail_json(msg=str(exc)) + except NetworkError as e: + module.fail_json(msg=to_native(e), exception=traceback.format_exc()) module.exit_json(**result) |