diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2016-06-09 11:50:51 -0300 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-06-09 11:50:51 -0300 |
| commit | 00eb0c79ed65543b3d358ae71b1a40fcbc88d78b (patch) | |
| tree | b791494908cd7341c420cc9c59dc6a2dd82db4a8 /filter_plugins | |
| parent | 096cf64128ebcb1249044a1cb28b1b06154766ae (diff) | |
| parent | 078e5dca2d945fc789bce1f90432a19b6a8db75f (diff) | |
| download | openshift-00eb0c79ed65543b3d358ae71b1a40fcbc88d78b.tar.gz openshift-00eb0c79ed65543b3d358ae71b1a40fcbc88d78b.tar.bz2 openshift-00eb0c79ed65543b3d358ae71b1a40fcbc88d78b.tar.xz openshift-00eb0c79ed65543b3d358ae71b1a40fcbc88d78b.zip | |
Merge remote-tracking branch 'upstream/master' into upgrade33
Diffstat (limited to 'filter_plugins')
| -rw-r--r-- | filter_plugins/openshift_master.py | 12 |
1 files changed, 8 insertions, 4 deletions
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 |