diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-02-16 20:23:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-16 20:23:03 -0500 |
| commit | 43659a5b19508336efa6901c7a38a6fa39a5a144 (patch) | |
| tree | 9ffa334505dd3be680f2973446f0194d1c7c2393 /roles/lib_openshift/src/lib/import.py | |
| parent | c455be5a4d773bedbdc7870cbc33b049205524c4 (diff) | |
| parent | c4e712ba3cc40d1deed87f56c71b337193597422 (diff) | |
| download | openshift-43659a5b19508336efa6901c7a38a6fa39a5a144.tar.gz openshift-43659a5b19508336efa6901c7a38a6fa39a5a144.tar.bz2 openshift-43659a5b19508336efa6901c7a38a6fa39a5a144.tar.xz openshift-43659a5b19508336efa6901c7a38a6fa39a5a144.zip | |
Merge pull request #3383 from kwoodson/yedit_yaml_support
Adding fallback support for pyyaml.
Diffstat (limited to 'roles/lib_openshift/src/lib/import.py')
| -rw-r--r-- | roles/lib_openshift/src/lib/import.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/roles/lib_openshift/src/lib/import.py b/roles/lib_openshift/src/lib/import.py index 6344c1a54..a79297898 100644 --- a/roles/lib_openshift/src/lib/import.py +++ b/roles/lib_openshift/src/lib/import.py @@ -7,6 +7,7 @@ from __future__ import print_function import atexit +import copy import json import os import re @@ -14,5 +15,9 @@ import shutil import subprocess import tempfile # pylint: disable=import-error -import ruamel.yaml as yaml +try: + import ruamel.yaml as yaml +except ImportError: + import yaml + from ansible.module_utils.basic import AnsibleModule |