openstack
/
openstack-ansible-os_neutron
Code Issues Proposed changes

Merge "Enable overriding the service setup host python interpreter"

This commit is contained in:
Zuul 2018-12-01 18:58:31 +00:00 committed by Gerrit Code Review
parent be7a0a61ee 0323916985
commit a77bcb617f
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

@ -28,6 +28,7 @@ debug: False
# for the service setup. The host must already have
# clouds.yaml properly configured.
neutron_service_setup_host: "{{ openstack_service_setup_host | default('localhost') }}"
neutron_service_setup_host_python_interpreter: "{{ openstack_service_setup_host_python_interpreter | default((neutron_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable'])) }}"
###
### Packages Options

3
tasks/neutron_service_setup.yml
View File

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