Updated proxy usage and attributes
diff --git a/defaults/main.yml b/defaults/main.yml
index 7fa1f2a..6001348 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -4,9 +4,9 @@
- openldap
- openldap-clients
- openldap-servers
-
+openldap_legacy_version: 2.4.40
openldap_support:
-- http://ftp.altlinux.org/pub/distributions/ALTLinux/Sisyphus/x86_64/RPMS.classic//libsasl2-3-2.1.26-alt7.x86_64.rpm
+- http://ftp.altlinux.org/pub/distributions/ALTLinux/Sisyphus/x86_64/RPMS.classic/libsasl2-3-2.1.26-alt7.x86_64.rpm
openldap_2_4_40:
- openldap-2.4.40
@@ -18,11 +18,11 @@
#- openldap-clients-2.4.40-13.el7.x86_64.rpm
#- openldap-servers-2.4.40-13.el7.x86_64.rpm
-openldap_repo_host: http://mirror.centos.org/centos/6/os/x86_64/Packages
-openldap_versioned_names:
-- openldap-2.4.40-16.el6.x86_64.rpm
-- openldap-clients-2.4.40-16.el6.x86_64.rpm
-- openldap-servers-2.4.40-16.el6.x86_64.rpm
+#openldap_repo_host: http://mirror.centos.org/centos/6/os/x86_64/Packages
+#openldap_versioned_names:
+#- openldap-2.4.40-16.el6.x86_64.rpm
+#- openldap-clients-2.4.40-16.el6.x86_64.rpm
+#- openldap-servers-2.4.40-16.el6.x86_64.rpm
#- ftp://fr2.rpmfind.net/linux/centos/7.3.1611/os/x86_64/Packages/openldap-2.4.40-13.el7.x86_64.rpm
#- ftp://fr2.rpmfind.net/linux/centos/7.3.1611/os/x86_64/Packages/openldap-clients-2.4.40-13.el7.x86_64.rpm
diff --git a/tasks/with_no_proxy.yml b/tasks/with_no_proxy.yml
index 129a54e..07f9135 100644
--- a/tasks/with_no_proxy.yml
+++ b/tasks/with_no_proxy.yml
@@ -1,86 +1,45 @@
---
-- name: Install openldap packages if needed
- become: yes
- yum:
- name: "{{ item }}"
- state: present
- allow_downgrade: yes
- with_items: "{{ openldap }}"
- when: opdk_version | version_compare('4.17.05', '>')
-
- block:
- - name: Downgrade openldap packages if needed
+
+ - name: Install openldap packages if needed
become: yes
yum:
name: "{{ item }}"
state: present
allow_downgrade: yes
- with_items: "{{ openldap_2_4_40 }}"
- when: opdk_version | version_compare('4.17.05', '<=')
+ with_items: "{{ openldap }}"
+ when: opdk_version | version_compare('4.17.05', '>')
rescue:
-# - name: Remove existing openldap packages
-# yum:
-# name: "{{ item }}"
-# state: absent
-# with_items:
-# - "{{ openldap[1] }}"
-# - "{{ openldap[2] }}"
-# - name: Clean yum cache
-# shell: "yum clean all"
+ - block:
-# - name: Install supporting packages
-# yum:
-# name: "{{ item }}"
-# state: present
-# allow_downgrade: yes
-# with_items: "{{ openldap_support }}"
+ - name: Downgrade openldap packages if needed
+ become: yes
+ yum:
+ name: "{{ item }}"
+ state: present
+ allow_downgrade: yes
+ with_items: "{{ openldap_downgrade_version }}"
+ when: opdk_version | version_compare('4.17.09', '<')
- - name: Install openldap manually
- shell: "rpm -Uvh --oldpackage {{ openldap_repo_host }}/{{ openldap_versioned_names[0] }}"
+ rescue:
+ - block:
-# - name: Install the remainder openldap manually
-# shell: "rpm -ivh --oldpackage {{ openldap_manual_download[1:2] }}"
+ - name: Installed named version
+ yum:
+ name: "{{ item }}"
+ state: present
+ with_items: "{{ openldap_named_versions }}"
-# - name: Remove prior openldap servers and clients
-# yum:
-# name: "{{ item }}"
-# state: absent
-# with_items:
-# - "{{ openldap[1] }}"
-# - "{{ openldap[2] }}"
+ rescue:
+ - name: Install the remainder openldap manually
+ shell: "rpm -ivh --oldpackage {{ openldap_named_versions }}"
- - name: Download openldap manually, may need to change the link
- yum:
- name: "{{ openldap_repo_host}}/{{ item }}"
- state: present
- allow_downgrade: yes
- with_items:
- - "{{ openldap_versioned_names[1] }}"
- - "{{ openldap_versioned_names[2] }}"
+ become: yes
+ when: opdk_version | version_compare('4.17.05', '<=') and ansible_distribution_major_version | version_compare("6", ">" )
-# - name: Download openldap manually, may need to change the link
-# yum:
-# name: "{{ item }}"
-# state: present
-# allow_downgrade: yes
-# with_items: "{{ openldap_2_4_40 }}"
-#
-# - name: Download openldap manually, may need to change the link
-# yum:
-# name: "{{ item }}"
-# state: present
-# allow_downgrade: yes
-# with_items: "{{ openldap_manual_download }}"
-
- become: yes
- when: opdk_version | version_compare('4.17.05', '<=') and ansible_distribution_major_version | version_compare("6", ">" )
-
-# - name: Downgrade openldap packages if needed
-# become: yes
-# shell: "yum install -y {{ openldap_2_4_40 | join(' ') }}"
-
+#- block:
# - name: Update LDAP dependent libraries
# file:
# force: yes
@@ -90,13 +49,6 @@
# with_items: "{{ ldap_dependent_library_links }}"
# rescue:
-# - name: Download openldap manually, may need to change the link
-# become: yes
-# yum:
-# name: "{{ item }}"
-# state: present
-# allow_downgrade: yes
-# with_items: "{{ openldap_manual_download }}"
# - name: Update LDAP dependent libraries
# file:
