diff options
| author | Kenny Woodson <kwoodson@redhat.com> | 2017-02-16 15:44:26 -0500 |
|---|---|---|
| committer | Kenny Woodson <kwoodson@redhat.com> | 2017-02-16 15:46:14 -0500 |
| commit | d4db2dd279916c2a1f73c236deed444fed5cc740 (patch) | |
| tree | 9e2185c969136790788f8ef21435df480719dcf3 /roles/lib_openshift/src/lib/import.py | |
| parent | 42af186c6f961a9a7cd76abc4ac423d9141bded2 (diff) | |
| download | openshift-d4db2dd279916c2a1f73c236deed444fed5cc740.tar.gz openshift-d4db2dd279916c2a1f73c236deed444fed5cc740.tar.bz2 openshift-d4db2dd279916c2a1f73c236deed444fed5cc740.tar.xz openshift-d4db2dd279916c2a1f73c236deed444fed5cc740.zip | |
Fixed tests for pyyaml vs ruamel. Added import logic. Fixed safe load.
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 |