Merge "Enable overriding the service setup host python interpreter"

This commit is contained in:
Zuul 2018-11-30 22:36:00 +00:00 committed by Gerrit Code Review
commit bf4a6d240e
2 changed files with 2 additions and 2 deletions

View File

@ -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'

View File

@ -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: