Skip to content

Allow virtualenv definitions to share the same requirements file #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stankevich merged 2 commits into from
Mar 14, 2013
Merged

Allow virtualenv definitions to share the same requirements file #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
451b215
Resolve a cyclic dependency
Mar 11, 2013
88c1780
Allow virtualenv definitions to share the same requirements file
Mar 11, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion manifests/config.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
Class['python::install'] -> Python::Virtualenv <| |>

Python::Virtualenv <| |> -> Python::Pip <| |>
Python::Virtualenv <| |> -> Python::Requirements <| |>

if $python::gunicorn {
Class['python::install'] -> Python::Gunicorn <| |>
Expand Down
28 changes: 17 additions & 11 deletions manifests/requirements.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
#
Expand All @@ -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",
Expand All @@ -41,13 +43,17 @@

$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
Expand Down
16 changes: 11 additions & 5 deletions manifests/virtualenv.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,18 @@
}

if $requirements {
Exec["python_virtualenv_${venv_dir}"]
-> Python::Requirements[$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,
python::requirements { "${requirements}_${venv_dir}":
requirements => $requirements,
virtualenv => $venv_dir,
proxy => $proxy,
require => Exec["python_virtualenv_${venv_dir}"],
}
}

Expand Down