From 87373e75d90e118b4fe3033fec8267f6f86adff8 Mon Sep 17 00:00:00 2001 From: Davide Belloni Date: Thu, 15 Dec 2016 15:28:59 +0100 Subject: [PATCH] Adding Proxy support --- roles/ceph-common-coreos/tasks/install_pip.yml | 6 +++--- roles/ceph-common-coreos/tasks/install_pypy.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/ceph-common-coreos/tasks/install_pip.yml b/roles/ceph-common-coreos/tasks/install_pip.yml index 81d6d77e4..a7b759d42 100644 --- a/roles/ceph-common-coreos/tasks/install_pip.yml +++ b/roles/ceph-common-coreos/tasks/install_pip.yml @@ -1,9 +1,9 @@ --- - name: download get_pip.py - raw: cd $HOME && wget {{pip_url}} + raw: cd $HOME && https_proxy="{{ lookup('env', 'https_proxy') }}" wget {{pip_url}} - name: run get-pip.py - raw: "{{pypy_binary_directory}}/python $HOME/get-pip.py" + raw: "{{pypy_binary_directory}}/python $HOME/get-pip.py --proxy='{{ lookup('env', 'https_proxy') }}'" - name: create local temp directory local_action: raw mkdir -p {{local_temp_directory}} @@ -19,7 +19,7 @@ - name: add execute permission raw: chmod a+x {{pypy_directory}}/pip -- name: create pypy_directory +- name: create pypy_directory raw: mkdir -p {{pypy_binary_directory}} - name: move python to binary directory diff --git a/roles/ceph-common-coreos/tasks/install_pypy.yml b/roles/ceph-common-coreos/tasks/install_pypy.yml index 38ad20763..c49c80d10 100644 --- a/roles/ceph-common-coreos/tasks/install_pypy.yml +++ b/roles/ceph-common-coreos/tasks/install_pypy.yml @@ -1,6 +1,6 @@ --- - name: download python - raw: cd $HOME && wget -O - {{coreos_pypy_url}} |tar -xjf - + raw: cd $HOME && https_proxy="{{ lookup('env', 'https_proxy') }}" wget -O - {{coreos_pypy_url}} |tar -xjf - - name: create pypy_directory raw: mkdir -p {{pypy_binary_directory}}