diff options
| -rw-r--r-- | manifests/requirements.pp | 28 | ||||
| -rw-r--r-- | manifests/virtualenv.pp | 11 |
2 files changed, 23 insertions, 16 deletions
diff --git a/manifests/requirements.pp b/manifests/requirements.pp index 4dd1f1f..22988e5 100644 --- a/manifests/requirements.pp +++ b/manifests/requirements.pp @@ -4,6 +4,9 @@ # # === Parameters # +# [*requirements*] +# Path to the requirements file. Defaults to the resource name +# # [*virtualenv*] # virtualenv to run pip in. Default: system-wide # @@ -23,12 +26,11 @@ # Ashley Penney # define python::requirements ( - $virtualenv = 'system', - $proxy = false + $requirements = $name, + $virtualenv = 'system', + $proxy = false ) { - $requirements = $name - $pip_env = $virtualenv ? { 'system' => '`which pip`', default => "${virtualenv}/bin/pip", @@ -41,13 +43,17 @@ define python::requirements ( $req_crc = "${requirements}.sha1" - file { $requirements: - ensure => present, - mode => '0644', - owner => 'root', - group => 'root', - replace => false, - content => '# Puppet will install and/or update pip packages listed here', + # This will ensure multiple python::virtualenv definitions can share the + # the same requirements file. + if !defined(File[$requirements]) { + file { $requirements: + ensure => present, + mode => '0644', + owner => 'root', + group => 'root', + replace => false, + content => '# Puppet will install and/or update pip packages listed here', + } } # SHA1 checksum to detect changes diff --git a/manifests/virtualenv.pp b/manifests/virtualenv.pp index e6c3900..b56da85 100644 --- a/manifests/virtualenv.pp +++ b/manifests/virtualenv.pp @@ -76,17 +76,18 @@ define python::virtualenv ( } if $requirements { - exec { "python_requirements_initial_install_${requirements}": + exec { "python_requirements_initial_install_${requirements}_${venv_dir}": command => "${venv_dir}/bin/pip install ${proxy_flag} --requirement ${requirements}", refreshonly => true, timeout => 1800, subscribe => Exec["python_virtualenv_${venv_dir}"], } - python::requirements { $requirements: - virtualenv => $venv_dir, - proxy => $proxy, - require => Exec["python_virtualenv_${venv_dir}"], + python::requirements { "${requirements}_${venv_dir}": + requirements => $requirements, + virtualenv => $venv_dir, + proxy => $proxy, + require => Exec["python_virtualenv_${venv_dir}"], } } |