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: I3ad7e3006180b0790232b0a6ccd4b57e5be7a30d
(cherry picked from commit c265ae146bf7e7f10c76ddd53472574f51056b86)
This commit is contained in:
Jesse Pretorius 2018-11-30 16:25:30 +00:00 committed by Jesse Pretorius (odyssey4me)
parent 6b6343f6ec
commit 508ea6d834
2 changed files with 2 additions and 2 deletions

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.
octavia_service_setup_host: "{{ openstack_service_setup_host | default('localhost') }}" octavia_service_setup_host: "{{ openstack_service_setup_host | default('localhost') }}"
octavia_service_setup_host_python_interpreter: "{{ openstack_service_setup_host_python_interpreter | default((octavia_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable'])) }}"
## Octavia standalone (v2) experimental ## Octavia standalone (v2) experimental
octavia_v2: True octavia_v2: True

View File

@ -21,8 +21,7 @@
- name: Setup the service - name: Setup the service
delegate_to: "{{ octavia_service_setup_host }}" delegate_to: "{{ octavia_service_setup_host }}"
vars: vars:
ansible_python_interpreter: >- ansible_python_interpreter: "{{ octavia_service_setup_host_python_interpreter }}"
{{ (octavia_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: