openstack/openstack-ansible-os_sahara
Code Issues Proposed changes

Merge "Enable overriding the service setup host python interpreter"

Browse Source
This commit is contained in:
Zuul 2018-11-30 21:43:06 +00:00 committed by Gerrit Code Review
commit 6ad122c708
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
defaults/main.yml
View File

@ -18,6 +18,7 @@ debug: False
# for the service setup. The host must already have # for the service setup. The host must already have
# clouds.yaml properly configured. # clouds.yaml properly configured.
sahara_service_setup_host: "{{ openstack_service_setup_host | default('localhost') }}" sahara_service_setup_host: "{{ openstack_service_setup_host | default('localhost') }}"
sahara_service_setup_host_python_interpreter: "{{ openstack_service_setup_host_python_interpreter | default((sahara_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable'])) }}"
# Set the package install state for distribution and pip packages # Set the package install state for distribution and pip packages
# Options are 'present' and 'latest' # Options are 'present' and 'latest'

3
tasks/sahara_service_setup.yml
View File

@ -19,8 +19,7 @@
- name: Setup the service - name: Setup the service
delegate_to: "{{ sahara_service_setup_host }}" delegate_to: "{{ sahara_service_setup_host }}"
vars: vars:
ansible_python_interpreter: >- ansible_python_interpreter: "{{ sahara_service_setup_host_python_interpreter }}"
{{ (sahara_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable']) }}
block: block:
- name: Add service to the keystone service catalog - name: Add service to the keystone service catalog
os_keystone_service: os_keystone_service: