opendev
/
puppet-askbot
Code Issues Proposed changes

Merge "Ensure more correct ordering"

This commit is contained in:
Zuul 2018-07-21 14:54:27 +00:00 committed by Gerrit Code Review
parent a8b2642d98 361721d8fb
commit fa98599f70
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
manifests/install.pp
View File

@ -96,18 +96,18 @@ class askbot::install (
exec { 'pip-requirements-install':
path => [ '/bin', '/sbin' , '/usr/bin', '/usr/sbin', '/usr/local/bin' ],
command => "/usr/askbot-env/bin/pip install -q -r ${dist_root}/askbot/askbot_requirements.txt",
command => "/usr/askbot-env/bin/pip install -r ${dist_root}/askbot/askbot_requirements.txt",
cwd => "${dist_root}/askbot",
logoutput => on_failure,
subscribe => Git['askbot'],
refreshonly => true,
require => Python::Virtualenv['/usr/askbot-env'],
}
python::pip { 'stopforumspam':
ensure => present,
pkgname => 'stopforumspam',
virtualenv => '/usr/askbot-env',
require => Python::Virtualenv['/usr/askbot-env'],
require => Exec[ 'pip-requirements-install' ],
}
include ::httpd::mod::wsgi
@ -119,7 +119,12 @@ class askbot::install (
logoutput => on_failure,
subscribe => Git['askbot'],
refreshonly => true,
require => Exec[ 'pip-requirements-install'],
require => [
Python::Virtualenv['/usr/askbot-env'],
Exec[ 'pip-requirements-install' ],
Python::Pip[ 'stopforumspam' ],
Python::Pip[ 'captcha' ],
],
}
}