From 6cdba6a985bdefa0da35662d8061000bc6c8e2de Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Tue, 30 May 2017 15:10:54 -0400 Subject: [PATCH] Create shade_pip_virtualenv_python This allows the user to choose which version of python to use in the virtualenv. Fix testing to use ansible_connection=ssh Change-Id: Id2505dfd949e72f603f3db692a7dbc59912b1b59 Signed-off-by: Paul Belanger --- defaults/main.yaml | 1 + tasks/install/git.yaml | 1 + tasks/install/pip.yaml | 1 + tests/inventory | 4 ++-- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/defaults/main.yaml b/defaults/main.yaml index a02c4bf..d203879 100644 --- a/defaults/main.yaml +++ b/defaults/main.yaml @@ -22,4 +22,5 @@ shade_install_method: git shade_pip_name: shade # shade_pip_extra_args: # shade_pip_version: +# shade_pip_virtualenv_python: # shade_pip_virtualenv: diff --git a/tasks/install/git.yaml b/tasks/install/git.yaml index f5e9e70..22c61f3 100644 --- a/tasks/install/git.yaml +++ b/tasks/install/git.yaml @@ -24,4 +24,5 @@ pip: extra_args: "{{ shade_pip_extra_args|default(omit) }}" name: "file://{{ shade_git_dest }}" + virtualenv_python: "{{ shade_pip_virtualenv_python|default(omit) }}" virtualenv: "{{ shade_pip_virtualenv|default(omit) }}" diff --git a/tasks/install/pip.yaml b/tasks/install/pip.yaml index f55d44c..e9100da 100644 --- a/tasks/install/pip.yaml +++ b/tasks/install/pip.yaml @@ -18,4 +18,5 @@ extra_args: "{{ shade_pip_extra_args|default(omit) }}" name: "{{ shade_pip_name }}" version: "{{ shade_pip_version|default(omit) }}" + virtualenv_python: "{{ shade_pip_virtualenv_python|default(omit) }}" virtualenv: "{{ shade_pip_virtualenv|default(omit) }}" diff --git a/tests/inventory b/tests/inventory index e512180..59f3595 100644 --- a/tests/inventory +++ b/tests/inventory @@ -1,2 +1,2 @@ -[test] -test01 ansible_host=127.0.0.2 +[all] +localhost ansible_connection=ssh