diff options
| author | Jarl Stefansson <jarl@sdelements.com> | 2014-01-03 11:33:12 -0500 |
|---|---|---|
| committer | Jarl Stefansson <jarl@sdelements.com> | 2014-01-03 11:33:12 -0500 |
| commit | ce3562f32bdf37d78228c22038a6b9d13f073c54 (patch) | |
| tree | d2b6125f12df90d892a4fc19c9f04710bd6e98f4 /manifests/requirements.pp | |
| parent | 895eebf2a03a29959d0c4dbd613cfa345ac22b55 (diff) | |
| parent | 2bab9c9a03cd01450877d897399c68f37fea0ff7 (diff) | |
Merge branch 'master' of https://github.com/stankevich/puppet-python
Conflicts:
manifests/pip.pp
manifests/virtualenv.pp
Merge curly braces around variable names
Diffstat (limited to 'manifests/requirements.pp')
| -rw-r--r-- | manifests/requirements.pp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/manifests/requirements.pp b/manifests/requirements.pp index ee44fa4..5fa6eb9 100644 --- a/manifests/requirements.pp +++ b/manifests/requirements.pp @@ -27,6 +27,11 @@ # [*environment*] # Additional environment variables required to install the packages. Default: none # +# [*forceupdate*] +# Run a pip install requirements even if we don't receive an event from the +# requirements file - Useful for when the requirements file is written as part of a +# resource other than file (E.g vcsrepo) +# # === Examples # # python::requirements { '/var/www/project1/requirements.txt': @@ -47,7 +52,8 @@ define python::requirements ( $group = 'root', $proxy = false, $src = false, - $environment = [] + $environment = [], + $forceupdate = false, ) { if $virtualenv == 'system' and ($owner != 'root' or $group != 'root') { @@ -56,7 +62,7 @@ define python::requirements ( $cwd = $virtualenv ? { 'system' => '/', - default => "${virtualenv}", + default => $virtualenv, } $pip_env = $virtualenv ? { @@ -91,7 +97,7 @@ define python::requirements ( exec { "python_requirements${name}": provider => shell, command => "${pip_env} --log ${cwd}/pip.log install ${proxy_flag} ${src_flag} -r ${requirements}", - refreshonly => true, + refreshonly => !$forceupdate, timeout => 1800, user => $owner, subscribe => File[$requirements], |