From d4db2dd279916c2a1f73c236deed444fed5cc740 Mon Sep 17 00:00:00 2001
From: Kenny Woodson <kwoodson@redhat.com>
Date: Thu, 16 Feb 2017 15:44:26 -0500
Subject: Fixed tests for pyyaml vs ruamel.  Added import logic.  Fixed safe
 load.

---
 roles/lib_openshift/src/lib/import.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'roles/lib_openshift/src/lib/import.py')

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
-- 
cgit v1.2.3