From 03239169853c955bb5fe722024c6ec77ac2f76d9 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Fri, 30 Nov 2018 14:57:24 +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: I50af72d6dd9561793d1d57af493c8885b5e1cd0d --- defaults/main.yml | 1 + tasks/neutron_service_setup.yml | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 43ba78d9..a2f88d9d 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -28,6 +28,7 @@ debug: False # for the service setup. The host must already have # clouds.yaml properly configured. neutron_service_setup_host: "{{ openstack_service_setup_host | default('localhost') }}" +neutron_service_setup_host_python_interpreter: "{{ openstack_service_setup_host_python_interpreter | default((neutron_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable'])) }}" ### ### Packages Options diff --git a/tasks/neutron_service_setup.yml b/tasks/neutron_service_setup.yml index cd8241c2..2f395253 100644 --- a/tasks/neutron_service_setup.yml +++ b/tasks/neutron_service_setup.yml @@ -21,8 +21,7 @@ - name: Setup the service delegate_to: "{{ neutron_service_setup_host }}" vars: - ansible_python_interpreter: >- - {{ (neutron_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable']) }} + ansible_python_interpreter: "{{ neutron_service_setup_host_python_interpreter }}" block: - name: Add service to the keystone service catalog os_keystone_service: