diff options
| author | Patrick Uiterwijk <puiterwijk@redhat.com> | 2016-11-23 12:43:32 +0000 |
|---|---|---|
| committer | Patrick Uiterwijk <puiterwijk@redhat.com> | 2016-11-23 13:28:54 +0000 |
| commit | c70a3f2758731fcb1570c3f00986a3b79c687d43 (patch) | |
| tree | 26b43d23cf04ed4f643390d45227f9c3b2cb0065 /roles/ipsilon/files/api.py | |
| parent | c9c904f2bd63ca7563b772ec3f28041716cb24db (diff) | |
| download | ansible-c70a3f2758731fcb1570c3f00986a3b79c687d43.tar.gz ansible-c70a3f2758731fcb1570c3f00986a3b79c687d43.tar.xz ansible-c70a3f2758731fcb1570c3f00986a3b79c687d43.zip | |
Make Ipsilon API plugin compatible with 1.2 and 2.0
Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
Diffstat (limited to 'roles/ipsilon/files/api.py')
| -rw-r--r-- | roles/ipsilon/files/api.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/roles/ipsilon/files/api.py b/roles/ipsilon/files/api.py index f0ebb17ef..40c4ef718 100644 --- a/roles/ipsilon/files/api.py +++ b/roles/ipsilon/files/api.py @@ -2,6 +2,10 @@ from __future__ import absolute_import +try: + from ipsilon.info.infofas import fas_make_userdata +except ImportError: + fas_make_userdata = None from ipsilon.providers.openid.extensions.common import OpenidExtensionBase import ipsilon.root from ipsilon.util.page import Page @@ -83,7 +87,10 @@ class APIV1Page(Page): userdata = None try: _, user = fas.fpc.login(username, password) - userdata = fas.page.make_userdata(user.user) + if fas_make_userdata is None: + userdata = fas.page.make_userdata(user.user) + else: + userdata = fas_make_userdata(user.user) except Exception, ex: print 'Error during auth: %s' % ex pass |