From c7e11dfcbda5b2984648a649403879e1b3e59c99 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Fri, 30 Nov 2018 16:42:46 +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: Icb3ea9ad782218c357ec0e3c577ecbe6fbf60461 --- defaults/main.yml | 1 + tasks/swift_service_setup.yml | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 40cf4ed9..ebf19ef6 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -24,6 +24,7 @@ debug: False # for the service setup. The host must already have # clouds.yaml properly configured. swift_service_setup_host: "{{ openstack_service_setup_host | default('localhost') }}" +swift_service_setup_host_python_interpreter: "{{ openstack_service_setup_host_python_interpreter | default((swift_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable'])) }}" # Set the package install state for distribution and pip packages # Options are 'present' and 'latest' diff --git a/tasks/swift_service_setup.yml b/tasks/swift_service_setup.yml index 03a69646..b72be433 100644 --- a/tasks/swift_service_setup.yml +++ b/tasks/swift_service_setup.yml @@ -21,8 +21,7 @@ - name: Setup the service delegate_to: "{{ swift_service_setup_host }}" vars: - ansible_python_interpreter: >- - {{ (swift_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable']) }} + ansible_python_interpreter: "{{ swift_service_setup_host_python_interpreter }}" block: - name: Add service to the keystone service catalog os_keystone_service: