From 70b5e95d0b2a1d50c466600738a3284ca552369c Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Fri, 30 Nov 2018 16:16:07 +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: Ia9fc197bc0ab75cac6842314fa5a2141eeff1d21 --- defaults/main.yml | 1 + tasks/ironic_service_setup.yml | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index f77a4443..ce8463df 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -22,6 +22,7 @@ debug: False # for the service setup. The host must already have # clouds.yaml properly configured. ironic_service_setup_host: "{{ openstack_service_setup_host | default('localhost') }}" +ironic_service_setup_host_python_interpreter: "{{ openstack_service_setup_host_python_interpreter | default((ironic_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable'])) }}" # Comma separated list of Glance API servers ironic_glance_api_servers: "{{ (glance_service_internalurl | default('http://localhost')) | netorigin }}" diff --git a/tasks/ironic_service_setup.yml b/tasks/ironic_service_setup.yml index 0321989f..8195081e 100644 --- a/tasks/ironic_service_setup.yml +++ b/tasks/ironic_service_setup.yml @@ -21,8 +21,7 @@ - name: Setup the service delegate_to: "{{ ironic_service_setup_host }}" vars: - ansible_python_interpreter: >- - {{ (ironic_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable']) }} + ansible_python_interpreter: "{{ ironic_service_setup_host_python_interpreter }}" block: - name: Add service to the keystone service catalog os_keystone_service: