Merge branch 'master' of github.com:carlosfrias/apigee-opdk-setup-os-minimum
diff --git a/tasks/main.yml b/tasks/main.yml
index a1d49c6..ef8b7db 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -128,7 +128,13 @@
     line: 'export CONTINUE_ON_WARNING={{ apigee_continue_on_warning }}'
     backup: yes
 
-- name: Add pip package manager
+- name: Configure pip
+  template:
+    src: pip.conf.j2
+    dest: "{{ pip_conf_dir }}/pip.conf"
+  when: pip_index_url is defined
+
+- name: Download pip package manager
   become: yes
   get_url:
     url: https://bootstrap.pypa.io/get-pip.py
diff --git a/templates/pip.conf.j2 b/templates/pip.conf.j2
new file mode 100644
index 0000000..c4f0766
--- /dev/null
+++ b/templates/pip.conf.j2
@@ -0,0 +1,2 @@
+[global]
+index-url = {{ pip_index_url }}