From 455c2b44332f3c8891c09d19e24d73af3f1317b8 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Fri, 30 Nov 2018 15:55:14 +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: Id8c2dfe7f3f82e0945d1b4b0027911a692cf1e8b --- defaults/main.yml | 1 + tasks/congress_service_setup.yml | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 03ea662..33eb09b 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -21,6 +21,7 @@ debug: False # for the service setup. The host must already have # clouds.yaml properly configured. congress_service_setup_host: "{{ openstack_service_setup_host | default('localhost') }}" +congress_service_setup_host_python_interpreter: "{{ openstack_service_setup_host_python_interpreter | default((congress_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable'])) }}" ## Set the package install state for distribution packages congress_pip_package_state: "latest" diff --git a/tasks/congress_service_setup.yml b/tasks/congress_service_setup.yml index d027e1f..7a2c33f 100644 --- a/tasks/congress_service_setup.yml +++ b/tasks/congress_service_setup.yml @@ -22,8 +22,7 @@ - name: Setup the service delegate_to: "{{ congress_service_setup_host }}" vars: - ansible_python_interpreter: >- - {{ (congress_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable']) }} + ansible_python_interpreter: "{{ congress_service_setup_host_python_interpreter }}" block: - name: Add service to the keystone service catalog os_keystone_service: