added manual download of openldap packages
diff --git a/apigee-opdk-setup-os-openldap.iml b/apigee-opdk-setup-os-openldap.iml
new file mode 100644
index 0000000..8021953
--- /dev/null
+++ b/apigee-opdk-setup-os-openldap.iml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$" />
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ </component>
+</module>
\ No newline at end of file
diff --git a/defaults/main.yml b/defaults/main.yml
index 3edac70..a166660 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -11,6 +11,8 @@
- openldap-clients-2.4.40
- openldap-servers-2.4.40
-#wget ftp://fr2.rpmfind.net/linux/centos/7.3.1611/os/x86_64/Packages/openldap-2.4.40-13.el7.x86_64.rpm
-#wget ftp://fr2.rpmfind.net/linux/centos/7.3.1611/os/x86_64/Packages/openldap-servers-2.4.40-13.el7.x86_64.rpm
-#wget ftp://fr2.rpmfind.net/linux/centos/7.3.1611/os/x86_64/Packages/openldap-clients-2.4.40-13.el7.x86_64.rpm
\ No newline at end of file
+openldap_manual_download:
+- 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-servers-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 ba6b955..e5eb069 100644
--- a/tasks/with_no_proxy.yml
+++ b/tasks/with_no_proxy.yml
@@ -24,10 +24,19 @@
- { src: "/lib64/libldap_r-2.4.so.2.10.3", path: "/lib64/libldap_r-2.4.so.2" }
rescue:
- - name: Install because downgrade failure means the openldap packages are needed
- become: yes
- yum:
- name: "{{ item }}"
- state: present
- with_items: "{{ openldap_2_4_40 }}"
+ - block:
+ - name: Install because downgrade failure means the openldap packages are needed
+ become: yes
+ yum:
+ name: "{{ item }}"
+ state: present
+ with_items: "{{ openldap_2_4_40 }}"
+
+ rescue:
+ - name: Download openldap manually, may need to change the link
+ yum:
+ name: "{{ item }}"
+ state: present
+ with_items: "{{ openldap_manual_download }}"
+
when: opdk_version | version_compare('4.17.01', '>=') and opdk_version | version_compare('4.17.05', '<=')
diff --git a/tasks/with_proxy.yml b/tasks/with_proxy.yml
index 91a0490..ed38967 100644
--- a/tasks/with_proxy.yml
+++ b/tasks/with_proxy.yml
@@ -36,14 +36,26 @@
no_proxy: "{{ no_proxy }}"
rescue:
- - name: Install because downgrade failure means the openldap packages are needed with proxy
- become: yes
- yum:
- name: "{{ item }}"
- state: present
- with_items: "{{ openldap_2_4_40 }}"
- environment:
- http_proxy: "{{ http_proxy }}"
- https_proxy: "{{ https_proxy }}"
- no_proxy: "{{ no_proxy }}"
+ - block:
+ - name: Install because downgrade failure means the openldap packages are needed with proxy
+ become: yes
+ yum:
+ name: "{{ item }}"
+ state: present
+ with_items: "{{ openldap_2_4_40 }}"
+ environment:
+ http_proxy: "{{ http_proxy }}"
+ https_proxy: "{{ https_proxy }}"
+ no_proxy: "{{ no_proxy }}"
+ rescue:
+ - name: Download openldap manually, may need to change the link
+ yum:
+ name: "{{ item }}"
+ state: present
+ with_items: "{{ openldap_manual_download }}"
+ environment:
+ http_proxy: "{{ http_proxy }}"
+ https_proxy: "{{ https_proxy }}"
+ no_proxy: "{{ no_proxy }}"
+
when: opdk_version | version_compare('4.17.01', '>=') and opdk_version | version_compare('4.17.05', '<=')
