Skip to content

Commit f6fd9f4

Browse files
committed
Now that all exec statements run under a particular owner, there is no need for the CPU intensive recursive virtualenv permission check
1 parent 5617ad2 commit f6fd9f4

1 file changed

Lines changed: 0 additions & 9 deletions

File tree

manifests/virtualenv.pp

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -84,22 +84,13 @@
8484
default => "-i ${index}",
8585
}
8686

87-
8887
exec { "python_virtualenv_${venv_dir}":
8988
command => "mkdir -p ${venv_dir} ${proxy_command} && virtualenv -p `which ${python}` ${system_pkgs_flag} ${venv_dir} && ${venv_dir}/bin/pip install ${pypi_index} ${proxy_flag} --upgrade ${distribute_pkg} pip",
9089
user => $owner,
9190
creates => "${venv_dir}/bin/activate",
9291
path => [ '/bin', '/usr/bin', '/usr/sbin' ],
9392
}
9493

95-
file{$venv_dir:
96-
ensure => directory,
97-
owner => $owner,
98-
group => $group,
99-
recurse => true,
100-
require => Exec["python_virtualenv_${venv_dir}"],
101-
}
102-
10394
if $requirements {
10495
exec { "python_requirements_initial_install_${requirements}_${venv_dir}":
10596
command => "${venv_dir}/bin/pip install ${pypi_index} ${proxy_flag} --requirement ${requirements}",

0 commit comments

Comments
 (0)