summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorJarl Stefansson <jarl@sdelements.com>2014-01-07 13:20:27 -0500
committerJarl Stefansson <jarl@sdelements.com>2014-01-07 13:20:27 -0500
commite6b4b9417139c97414f940dd4450fce21cf9af24 (patch)
treee79fd100f3c8f3b3bb9692110b46069eceebd632 /manifests
parent042f4eed2e15834a3c49abab485e5037ab805ca3 (diff)
Revert to using /tmp fir for cwd for virte inst.
If the virtualenv target directory does not exist before running the virtualenv command the puppet command will fail if the cwd does not exist, hence revert back to using the /tmp directory for current working directory.
Diffstat (limited to 'manifests')
-rw-r--r--manifests/virtualenv.pp2
1 files changed, 1 insertions, 1 deletions
diff --git a/manifests/virtualenv.pp b/manifests/virtualenv.pp
index 7f7fbb4..fc540a8 100644
--- a/manifests/virtualenv.pp
+++ b/manifests/virtualenv.pp
@@ -130,7 +130,7 @@ define python::virtualenv (
command => "mkdir -p ${venv_dir} ${proxy_command} && virtualenv ${system_pkgs_flag} -p ${python} ${venv_dir} && ${venv_dir}/bin/pip wheel --help > /dev/null 2>&1 && { ${venv_dir}/bin/pip wheel --version > /dev/null 2>&1 || wheel_support_flag='--no-use-wheel'; } ; ${venv_dir}/bin/pip --log ${venv_dir}/pip.log install ${pypi_index} ${proxy_flag} \$wheel_support_flag --upgrade pip ${distribute_pkg}",
user => $owner,
path => $path,
- cwd => $venv_dir,
+ cwd => "/tmp",
environment => $environment,
unless => "grep '^[\\t ]*VIRTUAL_ENV=[\\\\'\\\"]*${venv_dir}[\\\"\\\\'][\\t ]*$' ${venv_dir}/bin/activate", #Unless activate exists and VIRTUAL_ENV is correct we re-create the virtualenv
}