From 5815aa7332edb53722f1b8c48b9f9efdceb9753f Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Fri, 21 Sep 2018 18:47:29 +0100 Subject: [PATCH] Use virtualenv_path to set ansible_python_interpreter Prior to Ansible 2.5 Jinja expansion was not supported in this variable. Now that kayobe depends on 2.5, we can use the correct path. Change-Id: I85f62ae80a8751a356cee5a56bc01493ae04d6f4 Story: 2002010 Task: 19648 --- .../inventory/group_vars/overcloud/ansible-python-interpreter | 2 +- .../group_vars/seed-hypervisor/ansible-python-interpreter | 3 +++ .../inventory/group_vars/seed/ansible-python-interpreter | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 etc/kayobe/inventory/group_vars/seed-hypervisor/ansible-python-interpreter diff --git a/etc/kayobe/inventory/group_vars/overcloud/ansible-python-interpreter b/etc/kayobe/inventory/group_vars/overcloud/ansible-python-interpreter index 569a711..54abbf2 100644 --- a/etc/kayobe/inventory/group_vars/overcloud/ansible-python-interpreter +++ b/etc/kayobe/inventory/group_vars/overcloud/ansible-python-interpreter @@ -1,3 +1,3 @@ --- # Use a virtual environment for remote operations. -ansible_python_interpreter: /opt/kayobe/venvs/kayobe/bin/python +ansible_python_interpreter: "{{ virtualenv_path }}/kayobe/bin/python" diff --git a/etc/kayobe/inventory/group_vars/seed-hypervisor/ansible-python-interpreter b/etc/kayobe/inventory/group_vars/seed-hypervisor/ansible-python-interpreter new file mode 100644 index 0000000..54abbf2 --- /dev/null +++ b/etc/kayobe/inventory/group_vars/seed-hypervisor/ansible-python-interpreter @@ -0,0 +1,3 @@ +--- +# Use a virtual environment for remote operations. +ansible_python_interpreter: "{{ virtualenv_path }}/kayobe/bin/python" diff --git a/etc/kayobe/inventory/group_vars/seed/ansible-python-interpreter b/etc/kayobe/inventory/group_vars/seed/ansible-python-interpreter index 569a711..54abbf2 100644 --- a/etc/kayobe/inventory/group_vars/seed/ansible-python-interpreter +++ b/etc/kayobe/inventory/group_vars/seed/ansible-python-interpreter @@ -1,3 +1,3 @@ --- # Use a virtual environment for remote operations. -ansible_python_interpreter: /opt/kayobe/venvs/kayobe/bin/python +ansible_python_interpreter: "{{ virtualenv_path }}/kayobe/bin/python"