Alexandros Kosiaris has submitted this change and it was merged.
Change subject: uwsgi: Add python3 support
......................................................................
uwsgi: Add python3 support
Remove explicit mentions of uwsgi-plugin-python3 from the various
classes throughout the tree using the uwsgi class directly or indirectly
(via the uwsgi::app)
Change-Id: I024017d680ba6e4661e32fe8f5932e1e52cd2621
---
M modules/ircyall/manifests/init.pp
M modules/ores/manifests/web.pp
M modules/uwsgi/manifests/init.pp
M modules/wikilabels/manifests/web.pp
4 files changed, 3 insertions(+), 13 deletions(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
diff --git a/modules/ircyall/manifests/init.pp
b/modules/ircyall/manifests/init.pp
index 88608e9..af2bb91 100644
--- a/modules/ircyall/manifests/init.pp
+++ b/modules/ircyall/manifests/init.pp
@@ -17,10 +17,6 @@
},
}
- package { 'uwsgi-plugin-python3':
- ensure => present,
- }
-
package { [
'python3-flask',
'python3-redis',
@@ -42,7 +38,7 @@
'socket' => '/run/uwsgi/ircyall-web.sock',
}
},
- require => Package['python3-ircyall', 'uwsgi-plugin-python3'],
+ require => Package['python3-ircyall'],
}
nginx::site { 'ircyall-web-nginx':
diff --git a/modules/ores/manifests/web.pp b/modules/ores/manifests/web.pp
index bec56a8..e3e9861 100644
--- a/modules/ores/manifests/web.pp
+++ b/modules/ores/manifests/web.pp
@@ -5,9 +5,6 @@
) {
require ores::base
- # ORES is a python3 application \o/
- require_package('uwsgi-plugin-python3')
-
uwsgi::app { 'ores-web':
settings => {
uwsgi => {
diff --git a/modules/uwsgi/manifests/init.pp b/modules/uwsgi/manifests/init.pp
index 5739d45..b98bfeb 100644
--- a/modules/uwsgi/manifests/init.pp
+++ b/modules/uwsgi/manifests/init.pp
@@ -9,9 +9,9 @@
# 'uwsgi-plugins-all'. But I'm going to go out on a limb here and predict
# that we won't use any except these two. -- OL
if os_version('debian >= jessie') {
- $plugins = [ 'uwsgi-plugin-python', 'uwsgi-plugin-rack-ruby2.1' ]
+ $plugins = [ 'uwsgi-plugin-python', 'uwsgi-plugin-python3',
'uwsgi-plugin-rack-ruby2.1' ]
} else {
- $plugins = [ 'uwsgi-plugin-python', 'uwsgi-plugin-rack-ruby1.9.1' ]
+ $plugins = [ 'uwsgi-plugin-python', 'uwsgi-plugin-python3',
'uwsgi-plugin-rack-ruby1.9.1' ]
}
package { [ 'uwsgi', 'uwsgi-dbg' ]: }
diff --git a/modules/wikilabels/manifests/web.pp
b/modules/wikilabels/manifests/web.pp
index 3f99a6c..8e3b8ed 100644
--- a/modules/wikilabels/manifests/web.pp
+++ b/modules/wikilabels/manifests/web.pp
@@ -14,9 +14,6 @@
ensure_packages(['virtualenv', 'python3-dev', 'libffi-dev',
'libpq-dev', 'g++', 'libmemcached-dev'])
- # Wikilabels is a python3 application
- ensure_packages(['uwsgi-plugin-python3'])
-
file { '/srv':
ensure => directory,
owner => 'root',
--
To view, visit https://gerrit.wikimedia.org/r/283492
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I024017d680ba6e4661e32fe8f5932e1e52cd2621
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Ladsgroup <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
