summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-01-22 14:12:33 +0000
committerGerrit Code Review <review@openstack.org>2019-01-22 14:12:33 +0000
commitef51958940aa39c28f12a965ce66ec79bb26c908 (patch)
treeb5537bba1b97907cc3a85d583d7a4a4edb526c2a
parent3cdd0d103afef8b7d9f48da72c1c47765e473bad (diff)
parent273d4fd2d5c5c0e56c89738534c7ed9b088e06bd (diff)
Merge "Enable overriding the service setup host python interpreter"
-rw-r--r--defaults/main.yml1
-rw-r--r--tasks/designate_service_setup.yml3
2 files changed, 2 insertions, 2 deletions
diff --git a/defaults/main.yml b/defaults/main.yml
index 3c34158..969ff8f 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -23,6 +23,7 @@ designate_ceilometer_enabled: False
23# for the service setup. The host must already have 23# for the service setup. The host must already have
24# clouds.yaml properly configured. 24# clouds.yaml properly configured.
25designate_service_setup_host: "{{ openstack_service_setup_host | default('localhost') }}" 25designate_service_setup_host: "{{ openstack_service_setup_host | default('localhost') }}"
26designate_service_setup_host_python_interpreter: "{{ openstack_service_setup_host_python_interpreter | default((designate_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable'])) }}"
26 27
27# Set the package install state for distribution packages 28# Set the package install state for distribution packages
28# Options are 'present' and 'latest' 29# Options are 'present' and 'latest'
diff --git a/tasks/designate_service_setup.yml b/tasks/designate_service_setup.yml
index 59aa1de..14144a9 100644
--- a/tasks/designate_service_setup.yml
+++ b/tasks/designate_service_setup.yml
@@ -21,8 +21,7 @@
21- name: Setup the service 21- name: Setup the service
22 delegate_to: "{{ designate_service_setup_host }}" 22 delegate_to: "{{ designate_service_setup_host }}"
23 vars: 23 vars:
24 ansible_python_interpreter: >- 24 ansible_python_interpreter: "{{ designate_service_setup_host_python_interpreter }}"
25 {{ (designate_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable']) }}
26 block: 25 block:
27 - name: Add service to the keystone service catalog 26 - name: Add service to the keystone service catalog
28 os_keystone_service: 27 os_keystone_service: