From 605a92baf77e275cecd7ab03a59375af940e8f5d Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Fri, 30 Nov 2018 16:46:23 +0000 Subject: [PATCH] Enable overriding the service setup host python interpreter In order to enable the service setup host python interpreter to be changed easily, we make it a variable. This will be useful when someone sets the service setup host to be the utility container, because we'll be able to set this var by default. Change-Id: Ie3b2c2e04c25737653bd53890fcd847d4b3a430e --- defaults/main.yml | 1 + tasks/tempest_resources.yml | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 4aab622e..0022dc57 100644 --- a/defaults/main.yml +++ b/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 diff --git a/tasks/tempest_resources.yml b/tasks/tempest_resources.yml index 9524af38..42c18da7 100644 --- a/tasks/tempest_resources.yml +++ b/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: