Browse Source

Merge "Enable overriding the service setup host python interpreter"

changes/03/634303/1
Zuul 5 months ago
parent
commit
ef51958940
2 changed files with 2 additions and 2 deletions
  1. 1
    0
      defaults/main.yml
  2. 1
    2
      tasks/designate_service_setup.yml

+ 1
- 0
defaults/main.yml View File

@@ -23,6 +23,7 @@ designate_ceilometer_enabled: False
23 23
 # for the service setup. The host must already have
24 24
 # clouds.yaml properly configured.
25 25
 designate_service_setup_host: "{{ openstack_service_setup_host | default('localhost') }}"
26
+designate_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 28
 # Set the package install state for distribution packages
28 29
 # Options are 'present' and 'latest'

+ 1
- 2
tasks/designate_service_setup.yml View File

@@ -21,8 +21,7 @@
21 21
 - name: Setup the service
22 22
   delegate_to: "{{ designate_service_setup_host }}"
23 23
   vars:
24
-    ansible_python_interpreter: >-
25
-      {{ (designate_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable']) }}
24
+    ansible_python_interpreter: "{{ designate_service_setup_host_python_interpreter }}"
26 25
   block:
27 26
     - name: Add service to the keystone service catalog
28 27
       os_keystone_service:

Loading…
Cancel
Save