summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-01-21 11:06:49 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2016-01-21 11:06:49 -0500
commit4e04c87d7f47460eb590c1fb208bc2c19186a10f (patch)
treeb81e84a4b03f43b166c045a144376167baeb530b
parentbdedb63403ea582c4aaa5f56caed302f51744de2 (diff)
parent92c1cf5ae7db029b8feed23095a0e3df99de0ba2 (diff)
downloadopenshift-4e04c87d7f47460eb590c1fb208bc2c19186a10f.tar.gz
openshift-4e04c87d7f47460eb590c1fb208bc2c19186a10f.tar.bz2
openshift-4e04c87d7f47460eb590c1fb208bc2c19186a10f.tar.xz
openshift-4e04c87d7f47460eb590c1fb208bc2c19186a10f.zip
Merge pull request #1251 from abutcher/pcs-status
Fix 'pcs status' validation filter
-rw-r--r--filter_plugins/openshift_master.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/filter_plugins/openshift_master.py b/filter_plugins/openshift_master.py
index 7ababc51a..35a881a85 100644
--- a/filter_plugins/openshift_master.py
+++ b/filter_plugins/openshift_master.py
@@ -478,8 +478,8 @@ class FilterModule(object):
'master3.example.com']
returns True
'''
- if not issubclass(type(data), str):
- raise errors.AnsibleFilterError("|failed expects data is a string")
+ if not issubclass(type(data), basestring):
+ raise errors.AnsibleFilterError("|failed expects data is a string or unicode")
if not issubclass(type(masters), list):
raise errors.AnsibleFilterError("|failed expects masters is a list")
valid = True