From 0319e1f4a1206bc001f45b00d9f2e96932c308ff Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Thu, 7 Jul 2022 23:00:16 +0200 Subject: [PATCH] Update to 2022-07-07 23:00 --- roles/ldap2pg/tasks/install.yml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/roles/ldap2pg/tasks/install.yml b/roles/ldap2pg/tasks/install.yml index 4b31021..75cde1d 100644 --- a/roles/ldap2pg/tasks/install.yml +++ b/roles/ldap2pg/tasks/install.yml @@ -4,11 +4,17 @@ package: name={{ ldap2pg_packages }} tags: pg -- name: Patch ldap2pg to specify global cacert - patch: src=ldap2pg_cacert.diff dest=/usr/lib/python2.7/site-packages/ldap2pg/ldap.py - when: - - ansible_os_family == 'RedHat' - - ansible_distribution_major_version is version('8', '<') +- when: ansible_os_family == 'RedHat' and ansible_distribution_major_version is version('8', '<') + block: + - name: Check if ldap2Pg is built with python 2 or 3 + stat: path=/usr/lib/python3.6/site-packages/ldap2pg/ldap.py + register: ldap2pg_py + + - name: Set ldap.py path + set_fact: ldap_py_ver={{ ldap2pg_py.stat.exists | ternary('3.6', '2.7') }} + + - name: Patch ldap2pg to specify global cacert + patch: src=ldap2pg_cacert.diff dest=/usr/lib/python{{ ldap_py_ver }}/site-packages/ldap2pg/ldap.py tags: pg - name: Install systemd unit