openstack
/
openstack-ansible-os_manila
Code Issues Proposed changes

Merge "Fix python path when deploy host is not localhost"

This commit is contained in:
Zuul 2020-03-16 14:52:40 +00:00 committed by Gerrit Code Review
parent 343adcdfe0 6170d71caa
commit f8dcdef169
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
defaults/main.yml
View File

@ -22,6 +22,7 @@ manila_pip_package_state: "latest"
# for the service setup. The host must already have
# clouds.yaml properly configured.
manila_service_setup_host: "{{ openstack_service_setup_host | default('localhost') }}"
manila_service_setup_host_python_interpreter: "{{ openstack_service_setup_host_python_interpreter | default((manila_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable'])) }}"
# Set installation method.
manila_install_method: "source"

2
tasks/main.yml
View File

@ -143,7 +143,7 @@
_service_adminuri_insecure: "{{ keystone_service_adminuri_insecure }}"
_service_in_ldap: "{{ manila_service_in_ldap }}"
_service_setup_host: "{{ manila_service_setup_host }}"
_service_setup_host_python_interpreter: "{{ (manila_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable']) }}"
_service_setup_host_python_interpreter: "{{ manila_service_setup_host_python_interpreter }}"
_service_project_name: "{{ manila_service_project_name }}"
_service_region: "{{ manila_service_region }}"
_service_endpoints: "{{ manila_service_endpoints }}"