openstack/openstack-ansible-os_horizon
Code Issues Proposed changes

Merge "Enable overriding the service setup host python interpreter"

Browse Source
This commit is contained in:
Zuul 2018-12-03 15:54:35 +00:00 committed by Gerrit Code Review
commit a3a4910be4
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

@ -20,6 +20,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.
horizon_service_setup_host: "{{ openstack_service_setup_host | default('localhost') }}" horizon_service_setup_host: "{{ openstack_service_setup_host | default('localhost') }}"
horizon_service_setup_host_python_interpreter: "{{ openstack_service_setup_host_python_interpreter | default((horizon_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/horizon_service_setup.yml
View File

@ -21,8 +21,7 @@
- name: Setup the default member role - name: Setup the default member role
delegate_to: "{{ horizon_service_setup_host }}" delegate_to: "{{ horizon_service_setup_host }}"
vars: vars:
ansible_python_interpreter: >- ansible_python_interpreter: "{{ horizon_service_setup_host_python_interpreter }}"
{{ (horizon_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable']) }}
block: block:
- name: Add default member role - name: Add default member role
os_keystone_role: os_keystone_role: