[MediaWiki-commits] [Gerrit] striker: switch to Python3 runtime - change (mediawiki/vagrant)

[BryanDavis (Code Review)]

BryanDavis has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/296805

Change subject: striker: switch to Python3 runtime
......................................................................

striker: switch to Python3 runtime

Striker is going to be all Python3 all the time.

Change-Id: I0c303064338715c8e45bbfc1f196f3c01c32ce3c
---
M puppet/modules/role/manifests/striker.pp
M puppet/modules/role/templates/striker/apache.conf.erb
2 files changed, 10 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/05/296805/1

diff --git a/puppet/modules/role/manifests/striker.pp 
b/puppet/modules/role/manifests/striker.pp
index cc979ec..554cb52 100644
--- a/puppet/modules/role/manifests/striker.pp
+++ b/puppet/modules/role/manifests/striker.pp
@@ -68,7 +68,7 @@
     require ::role::mediawiki
     include ::role::oauth
     include ::role::ldapauth
-    include ::apache::mod::wsgi
+    include ::apache::mod::wsgi_py3
     include ::memcached
 
     file { "${log_dir}/striker":
@@ -90,18 +90,22 @@
     }
 
     # Add packages needed for virtualenv built python modules
+    $python = 'python3.4'
     require_package(
         'libffi-dev',
         'libldap2-dev',
         'libmysqlclient-dev',
         'libsasl2-dev',
         'libssl-dev',
+        $python,
+        "${python}-dev",
     )
 
     $venv = "${app_dir}/.venv"
     virtualenv::environment { $venv:
-        owner => $::share_owner,
-        group => $::share_group,
+        owner  => $::share_owner,
+        group  => $::share_group,
+        python => $python,
     }
     virtualenv::package { 'striker':
         path          => $venv,
@@ -165,7 +169,7 @@
         # Load before MediaWiki wildcard vhost for Labs.
         priority => 40,
         content  => template('role/striker/apache.conf.erb'),
-        require  => Class['apache::mod::wsgi'],
+        require  => Class['apache::mod::wsgi_py3'],
         notify   => Service['apache2'],
     }
 
diff --git a/puppet/modules/role/templates/striker/apache.conf.erb 
b/puppet/modules/role/templates/striker/apache.conf.erb
index 5747540..c32e1b1 100644
--- a/puppet/modules/role/templates/striker/apache.conf.erb
+++ b/puppet/modules/role/templates/striker/apache.conf.erb
@@ -1,10 +1,11 @@
 ServerName <%= @vhost_name %>
 DocumentRoot <%= @app_dir %>
 
+SetEnv DJANGO_SETTINGS_MODULE striker.settings
 # Enable wsgi automatic reload magic
 SetEnv DJANGO_DEBUG True
 
-WSGIDaemonProcess striker python-path=<%= @app_dir %>:<%= @venv 
%>/lib/python2.7/site-packages home=<%= @app_dir %> display-name=%{GROUP} 
threads=8
+WSGIDaemonProcess striker python-path=<%= @app_dir %>:<%= @venv %>/lib/<%= 
@python %>/site-packages home=<%= @app_dir %> display-name=%{GROUP} threads=8
 WSGIProcessGroup striker
 WSGIScriptAlias / <%= @deploy_dir %>/striker/striker/wsgi.py 
process-group=striker
 

-- 
To view, visit https://gerrit.wikimedia.org/r/296805
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0c303064338715c8e45bbfc1f196f3c01c32ce3c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <bda...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits