From 6f76d95d016ef24b78ed0cbb2a89378d52a9fc81 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Fri, 30 Nov 2018 16:56:00 +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: I2a4b1b82307b3dd195bff8f9a8fb219ad581c2ad --- defaults/main.yml | 1 + tasks/trove_service_setup.yml | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 5ca4385..13514bb 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -21,6 +21,7 @@ # for the service setup. The host must already have # clouds.yaml properly configured. trove_service_setup_host: "{{ openstack_service_setup_host | default('localhost') }}" +trove_service_setup_host_python_interpreter: "{{ openstack_service_setup_host_python_interpreter | default((trove_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable'])) }}" trove_package_state: "latest" trove_pip_package_state: "latest" diff --git a/tasks/trove_service_setup.yml b/tasks/trove_service_setup.yml index 634cc2f..93bfc13 100644 --- a/tasks/trove_service_setup.yml +++ b/tasks/trove_service_setup.yml @@ -24,8 +24,7 @@ - name: Setup the service delegate_to: "{{ trove_service_setup_host }}" vars: - ansible_python_interpreter: >- - {{ (trove_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable']) }} + ansible_python_interpreter: "{{ trove_service_setup_host_python_interpreter }}" block: - name: Add service to the keystone service catalog os_keystone_service: