Adding Proxy support

diff --git a/roles/ceph-common-coreos/tasks/install_pip.yml b/roles/ceph-common-coreos/tasks/install_pip.yml
index 81d6d77e47650a3b3bece60a195b7cf7191358e1..a7b759d42d9c4b51866a57e50d28ec402f6cee3d 100644 (file)
--- 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 38ad2076315d224189475736ce1e07c107519f09..c49c80d101db59a042897a64ad5375df65bb6ee3 100644 (file)
--- 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}}