From 5701ba78c681e6f9efd841e76382e3aeb9853c9b Mon Sep 17 00:00:00 2001 From: Andrew Butcher Date: Tue, 7 Jun 2016 13:56:30 -0400 Subject: Ansible 2.1 support. --- filter_plugins/openshift_master.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'filter_plugins') diff --git a/filter_plugins/openshift_master.py b/filter_plugins/openshift_master.py index bb79b27d1..b3f284a8e 100644 --- a/filter_plugins/openshift_master.py +++ b/filter_plugins/openshift_master.py @@ -13,11 +13,15 @@ from distutils.version import LooseVersion # pylint: disable=no-name-in-module,import-error try: - # ansible-2.0 - from ansible.runner.filter_plugins.core import bool as ansible_bool + # ansible-2.1 + from ansible.plugins.filter.core import to_bool as ansible_bool except ImportError: - # ansible-1.9.x - from ansible.plugins.filter.core import bool as ansible_bool + try: + #ansible-2.0.x + from ansible.runner.filter_plugins.core import bool as ansible_bool + except ImportError: + # ansible-1.9.x + from ansible.plugins.filter.core import bool as ansible_bool class IdentityProviderBase(object): """ IdentityProviderBase -- cgit v1.2.1