Fix wheel override

Makefile

@@ -1,6 +1,6 @@
 
 # If a wheel repository is defined, then have pip use that.  But don't require the use of wheel.
-ifdef WHEEL_PYVER
+ifneq ($(strip $(WHEEL_URL)),)
 	PIP_INSTALL = pip install --use-wheel --find-links=$$WHEEL_URL/Python-$$WHEEL_PYVER --allow-external mysql-connector-python
 else
 	PIP_INSTALL = pip install --allow-external mysql-connector-python

edx/analytics/tasks/launchers/remote.py

@@ -154,11 +154,8 @@ def convert_args_to_extra_vars(arguments, uid):
         extra_vars['secure_config_branch'] = arguments.secure_config_branch
     if arguments.secure_config:
         extra_vars['secure_config'] = arguments.secure_config
-    if arguments.wheel_url:
-        extra_vars['install_env'] = {
-            'WHEEL_URL': arguments.wheel_url,
-            'WHEEL_PYVER': '2.7'
-        }
+    if arguments.wheel_url is not None:
+        extra_vars['wheel_url'] = arguments.wheel_url
     if arguments.vagrant_path or arguments.host:
         extra_vars['write_luigi_config'] = False
     if arguments.virtualenv_extra_args:

share/task.yml

@@ -37,11 +37,7 @@
       - hostname: github.com
         public_key: 'ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ=='
     - local_log_dir: build/logs
-    - install_env_debian:
-        # EMR runs a modified version of Debian 6 (squeeze) on early AMIs, before switching their own RHEL variant.
-        WHEEL_URL: http://edx-wheelhouse.s3-website-us-east-1.amazonaws.com/Debian/squeeze
-        # Match the version of Python define in virtualenv_python above.
-        WHEEL_PYVER: 2.7
+    - wheel_pyver: 2.7
     - common_debian_variants:
       - Ubuntu
       - Debian
@@ -148,13 +144,18 @@
       shell: >
         . {{ working_venv_dir }}/bin/activate && make install
         chdir={{ working_repo_dir }}
-      environment: install_env_debian
+      environment:
+        WHEEL_URL: "{{ wheel_url | default('http://edx-wheelhouse.s3-website-us-east-1.amazonaws.com/Debian/squeeze') }}"
+        WHEEL_PYVER: "{{ wheel_pyver }}"
       when: ansible_distribution in common_debian_variants
 
     - name: virtualenv initialized on RHEL
       shell: >
         . {{ working_venv_dir }}/bin/activate && make install
         chdir={{ working_repo_dir }}
+      environment:
+        WHEEL_URL: "{{ wheel_url | default('http://edx-wheelhouse.s3-website-us-east-1.amazonaws.com/Amazon/emr4') }}"
+        WHEEL_PYVER: "{{ wheel_pyver }}"
       when: ansible_distribution in common_redhat_variants
 
     - name: logging configured