diff options
| author | Jarl Stefansson <jarl@sdelements.com> | 2014-01-27 13:41:10 -0500 |
|---|---|---|
| committer | Jarl Stefansson <jarl@sdelements.com> | 2014-01-27 13:41:10 -0500 |
| commit | 0671d69354bb4ddd65159a516dc38c32b05c5e05 (patch) | |
| tree | 7a3e08edf9e475846ebd486f363e5961d20712e0 /manifests | |
| parent | 97793765ee15a93fbde928aaf17397d0c397fa69 (diff) | |
| parent | 28c08f47ec6fce17f9f3e80385ed7e517fb1661b (diff) | |
Merge branch 'master' of https://github.com/stankevich/puppet-python
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/pip.pp | 8 | ||||
| -rw-r--r-- | manifests/requirements.pp | 1 | ||||
| -rw-r--r-- | manifests/virtualenv.pp | 2 |
3 files changed, 2 insertions, 9 deletions
diff --git a/manifests/pip.pp b/manifests/pip.pp index 367cdb3..4f91e59 100644 --- a/manifests/pip.pp +++ b/manifests/pip.pp @@ -120,14 +120,6 @@ define python::pip ( } } - latest: { - exec { "pip_install_${name}": - command => "${pip_env} wheel --help > /dev/null 2>&1 && { ${pip_env} wheel --version > /dev/null 2>&1 || wheel_support_flag='--no-use-wheel'; } ; ${pip_env} --log ${cwd}/pip.log install -U ${install_args} \$wheel_support_flag ${proxy_flag} ${source}", - user => $owner, - environment => $environment, - } - } - default: { exec { "pip_uninstall_${name}": command => "echo y | ${pip_env} uninstall ${uninstall_args} ${proxy_flag} ${name}", diff --git a/manifests/requirements.pp b/manifests/requirements.pp index 5fa6eb9..11c5f00 100644 --- a/manifests/requirements.pp +++ b/manifests/requirements.pp @@ -102,6 +102,7 @@ define python::requirements ( user => $owner, subscribe => File[$requirements], environment => $environment, + path => ['/usr/local/bin','/usr/bin','/bin', '/usr/sbin'], } } diff --git a/manifests/virtualenv.pp b/manifests/virtualenv.pp index 8c240ed..b9cd689 100644 --- a/manifests/virtualenv.pp +++ b/manifests/virtualenv.pp @@ -112,7 +112,7 @@ define python::virtualenv ( $distribute_pkg = $distribute ? { true => 'distribute', - default => '', + default => 'setuptools', } $pypi_index = $index ? { false => '', |