opendev
/
puppet-askbot
Code Issues Proposed changes

Merge "Use earlier six release"

This commit is contained in:
Zuul 2018-07-23 07:25:03 +00:00 committed by Gerrit Code Review
parent 6003fc90e5 d617cd1777
commit b7daee3f9d
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
manifests/install.pp
View File

@ -111,6 +111,16 @@ class askbot::install (
require => Exec[ 'pip-requirements-install' ],
}
# six 1.11.0 fails with this old django,
# use an earlier one; see
# https://github.com/benjaminp/six/issues/210
python::pip { 'six':
ensure => '1.10.0',
pkgname => 'six',
virtualenv => '/usr/askbot-env',
require => Python::Virtualenv['/usr/askbot-env'],
}
include ::httpd::mod::wsgi
exec { 'askbot-install':
@ -124,6 +134,7 @@ class askbot::install (
require => [
Python::Virtualenv['/usr/askbot-env'],
Exec[ 'pip-requirements-install' ],
Python::Pip[ 'six' ],
Python::Pip[ 'stopforumspam' ],
Python::Pip[ 'captcha' ],
],