From 6bb1821b1d0da0b9b4601a77684eb9227ce2f2dc Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Fri, 30 Nov 2018 14:46:23 +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: I3e0034739c75ca72bad4b33819e774e5c85977ac --- defaults/main.yml | 1 + tasks/cinder_service_setup.yml | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 0de4a61a..a5eed0e4 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -22,6 +22,7 @@ cinder_pip_package_state: "latest" # for the service setup. The host must already have # clouds.yaml properly configured. cinder_service_setup_host: "{{ openstack_service_setup_host | default('localhost') }}" +cinder_service_setup_host_python_interpreter: "{{ openstack_service_setup_host_python_interpreter | default((cinder_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable'])) }}" # Set installation method. cinder_install_method: "source" diff --git a/tasks/cinder_service_setup.yml b/tasks/cinder_service_setup.yml index 1c0cb087..899ed777 100644 --- a/tasks/cinder_service_setup.yml +++ b/tasks/cinder_service_setup.yml @@ -21,8 +21,7 @@ - name: Setup the service delegate_to: "{{ cinder_service_setup_host }}" vars: - ansible_python_interpreter: >- - {{ (cinder_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable']) }} + ansible_python_interpreter: "{{ cinder_service_setup_host_python_interpreter }}" block: - name: Add services to the keystone service catalog os_keystone_service: