percolate python_version down to the python-executable hadoop config

openedx-unsupported · Jul 26, 2019 · daff797 · daff797
1 parent 62dbed0
commit daff797
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 0 deletions.
diff --git a/config/devstack.cfg b/config/devstack.cfg
@@ -8,6 +8,9 @@ task_failed = 30
 scheduling_error = 35
 unhandled_exception = 40
 
+[hadoop]
+python-executable = ${PYTHON_EXECUTABLE}
+
 [hive]
 release = apache
 version = 1.0

diff --git a/config/docker_test.cfg b/config/docker_test.cfg
@@ -15,6 +15,9 @@ task_failed = 30
 scheduling_error = 35
 unhandled_exception = 40
 
+[hadoop]
+python-executable = ${PYTHON_EXECUTABLE}
+
 [hive]
 release = apache
 version = 1.0

diff --git a/config/luigi_docker.cfg b/config/luigi_docker.cfg
@@ -14,6 +14,9 @@ task_failed = 30
 scheduling_error = 35
 unhandled_exception = 40
 
+[hadoop]
+python-executable = ${PYTHON_EXECUTABLE}
+
 [hive]
 release = apache
 version = 1.0

diff --git a/config/test.cfg b/config/test.cfg
@@ -10,6 +10,9 @@ task_failed = 30
 scheduling_error = 35
 unhandled_exception = 40
 
+[hadoop]
+python-executable = ${PYTHON_EXECUTABLE}
+
 [hive]
 release = apache
 version = 1.0

diff --git a/edx/analytics/tasks/launchers/remote.py b/edx/analytics/tasks/launchers/remote.py
@@ -121,6 +121,8 @@ def run_task_playbook(inventory, arguments, uid):
     if arguments.workflow_profiler:
         env_vars['WORKFLOW_PROFILER'] = arguments.workflow_profiler
         env_vars['WORKFLOW_PROFILER_PATH'] = log_dir
+    if arguments.python_version:
+        env_vars['PYTHON_EXECUTABLE'] = python_version
 
     env_var_string = ' '.join('{0}={1}'.format(k, v) for k, v in env_vars.iteritems())