updated epel and pip updates
diff --git a/defaults/main.yml b/defaults/main.yml index ff59a95..7935a0f 100644 --- a/defaults/main.yml +++ b/defaults/main.yml
@@ -8,13 +8,6 @@ qpid_client: ftp://fr2.rpmfind.net/linux/epel/7/x86_64/q/qpid-cpp-client-1.35.0-3.el7.x86_64.rpm qpid_server: ftp://fr2.rpmfind.net/linux/epel/7/x86_64/q/qpid-cpp-server-1.35.0-3.el7.x86_64.rpm -pip_packages: -- httplib2 -- pexpect -- passlib -- requests -- kazoo - yum_packages: - bind-utils - chkconfig
diff --git a/tasks/with_no_proxy.yml b/tasks/with_no_proxy.yml index fd2bfd8..4d32a18 100644 --- a/tasks/with_no_proxy.yml +++ b/tasks/with_no_proxy.yml
@@ -17,31 +17,3 @@ shell: "sysctl -w net.ipv6.conf.all.disable_ipv6=1" tags: ['ipv6'] -- name: Download pip package manager - become: yes - tags: ['pip-manager'] - get_url: - url: https://bootstrap.pypa.io/get-pip.py - dest: /tmp/get-pip.py - when: pip_conf_dir is not defined - -- name: Install pip package manager - become: yes - tags: ['pip-manager'] - shell: python /tmp/get-pip.py - when: pip_conf_dir is not defined - -- name: Update pip - tags: ['pip'] - become: yes - pip: - name: pip - state: latest - -- name: Update python packages - tags: ['pip'] - become: yes - pip: - name: '{{ item }}' - state: present - with_items: "{{ pip_packages }}"
diff --git a/tasks/with_proxy.yml b/tasks/with_proxy.yml index 56ebfdb..0ea71a8 100644 --- a/tasks/with_proxy.yml +++ b/tasks/with_proxy.yml
@@ -19,47 +19,3 @@ https_proxy: "{{ https_proxy }}" no_proxy: "{{ no_proxy }}" -- name: Download pip package manager with proxy - become: yes - tags: ['pip-manager'] - get_url: - url: https://bootstrap.pypa.io/get-pip.py - dest: /tmp/get-pip.py - when: pip_conf_dir is not defined - environment: - http_proxy: "{{ http_proxy }}" - https_proxy: "{{ https_proxy }}" - no_proxy: "{{ no_proxy }}" - -- name: Install pip package manager with proxy - become: yes - tags: ['pip-manager'] - shell: python /tmp/get-pip.py - when: pip_conf_dir is not defined - environment: - http_proxy: "{{ http_proxy }}" - https_proxy: "{{ https_proxy }}" - no_proxy: "{{ no_proxy }}" - -- name: Update pip - tags: ['pip'] - become: yes - pip: - name: pip - state: latest - environment: - http_proxy: "{{ http_proxy }}" - https_proxy: "{{ https_proxy }}" - no_proxy: "{{ no_proxy }}" - -- name: Update python packages with no proxy - tags: ['pip'] - become: yes - pip: - name: '{{ item }}' - state: present - with_items: "{{ pip_packages }}" - environment: - http_proxy: "{{ http_proxy }}" - https_proxy: "{{ https_proxy }}" - no_proxy: "{{ no_proxy }}"