summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Pretorius <jesse.pretorius@rackspace.co.uk>2018-11-30 16:44:17 +0000
committerJesse Pretorius <jesse.pretorius@rackspace.co.uk>2018-11-30 16:44:17 +0000
commitf47ce32ee60611ec5a92214c789405ff07e989c7 (patch)
tree6bdb68f69f8b4bfc930b4b8b4f7437af46168808
parent7fde8d74cbc90aa5dba9c3c4ce4a7d9babd69490 (diff)
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: Ia3b8ac0cc8ca895c39b20eac30763ad4873f78b1
Notes
Notes (review): Code-Review+2: Marc GariƩpy (mgariepy) <gariepy.marc@gmail.com> Code-Review+2: Mohammed Naser <mnaser@vexxhost.com> Workflow+1: Mohammed Naser <mnaser@vexxhost.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Fri, 30 Nov 2018 20:36:59 +0000 Reviewed-on: https://review.openstack.org/621230 Project: openstack/openstack-ansible-os_tacker Branch: refs/heads/master
-rw-r--r--defaults/main.yml1
-rw-r--r--tasks/tacker_service_setup.yml3
2 files changed, 2 insertions, 2 deletions
diff --git a/defaults/main.yml b/defaults/main.yml
index d032db7..4885ec1 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -26,6 +26,7 @@ tacker_ceilometer_enabled: False
26# for the service setup. The host must already have 26# for the service setup. The host must already have
27# clouds.yaml properly configured. 27# clouds.yaml properly configured.
28tacker_service_setup_host: "{{ openstack_service_setup_host | default('localhost') }}" 28tacker_service_setup_host: "{{ openstack_service_setup_host | default('localhost') }}"
29tacker_service_setup_host_python_interpreter: "{{ openstack_service_setup_host_python_interpreter | default((tacker_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable'])) }}"
29 30
30# Set the package install state for distribution packages 31# Set the package install state for distribution packages
31# Options are 'present' and 'latest' 32# Options are 'present' and 'latest'
diff --git a/tasks/tacker_service_setup.yml b/tasks/tacker_service_setup.yml
index 06ccacc..9cb1984 100644
--- a/tasks/tacker_service_setup.yml
+++ b/tasks/tacker_service_setup.yml
@@ -23,8 +23,7 @@
23- name: Setup the service 23- name: Setup the service
24 delegate_to: "{{ tacker_service_setup_host }}" 24 delegate_to: "{{ tacker_service_setup_host }}"
25 vars: 25 vars:
26 ansible_python_interpreter: >- 26 ansible_python_interpreter: "{{ tacker_service_setup_host_python_interpreter }}"
27 {{ (tacker_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable']) }}
28 block: 27 block:
29 - name: Add service to the keystone service catalog 28 - name: Add service to the keystone service catalog
30 os_keystone_service: 29 os_keystone_service: