Merge "Enable overriding the service setup host python interpreter"

defaults/main.yml

@@ -33,6 +33,7 @@ tempest_pip_package_state: "latest"
 # for the service setup. The host must already have
 # clouds.yaml properly configured.
 tempest_service_setup_host: "{{ openstack_service_setup_host | default('localhost') }}"
+tempest_service_setup_host_python_interpreter: "{{ openstack_service_setup_host_python_interpreter | default((tempest_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable'])) }}"
 
 # Toggle whether tempest actually executes
 tempest_run: no

tasks/tempest_resources.yml

@@ -21,8 +21,7 @@
 - name: Setup the tempest resources
   delegate_to: "{{ tempest_service_setup_host }}"
   vars:
-    ansible_python_interpreter: >-
-      {{ (tempest_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable']) }}
+    ansible_python_interpreter: "{{ tempest_service_setup_host_python_interpreter }}"
   block:
     - name: Ensures you have at least one image to upload
       assert: