Gilles has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/399432 )
Change subject: Fix Eventlogging role for Stretch
......................................................................
Fix Eventlogging role for Stretch
Bug: T183380
Change-Id: I483a174632ba6928b408b13188683c5167ad47b8
---
M puppet/modules/eventlogging/manifests/devserver.pp
M puppet/modules/eventlogging/manifests/init.pp
M puppet/modules/eventlogging/manifests/service.pp
A puppet/modules/eventlogging/templates/systemd/eventlogging-devserver.epp
D puppet/modules/eventlogging/templates/systemd/eventlogging-devserver.erb
R puppet/modules/eventlogging/templates/systemd/eventlogging-service.epp
6 files changed, 27 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/32/399432/1
diff --git a/puppet/modules/eventlogging/manifests/devserver.pp
b/puppet/modules/eventlogging/manifests/devserver.pp
index 0fdaf8b..88c3f3a 100644
--- a/puppet/modules/eventlogging/manifests/devserver.pp
+++ b/puppet/modules/eventlogging/manifests/devserver.pp
@@ -9,6 +9,11 @@
$eventlogging_path = $::eventlogging::path
systemd::service { 'eventlogging-devserver':
- ensure => 'present',
+ ensure => 'present',
+ epp_template => true,
+ template_variables => {
+ 'eventlogging_path' => $eventlogging_path,
+ 'output_file' => $output_file,
+ },
}
}
diff --git a/puppet/modules/eventlogging/manifests/init.pp
b/puppet/modules/eventlogging/manifests/init.pp
index d205fbc..cd7027b 100644
--- a/puppet/modules/eventlogging/manifests/init.pp
+++ b/puppet/modules/eventlogging/manifests/init.pp
@@ -20,7 +20,7 @@
# Do the initial pip install into the virtualenv
exec { 'eventlogging_virtualenv_pip_install':
- command => "${path}/virtualenv/bin/pip install -e .",
+ command => "${path}/virtualenv/bin/pip install --no-binary mysqlclient
-e .",
cwd => $path,
creates =>
"${path}/virtualenv/local/lib/python2.7/site-packages/eventlogging.egg-link",
require => [
diff --git a/puppet/modules/eventlogging/manifests/service.pp
b/puppet/modules/eventlogging/manifests/service.pp
index fb78b1f..9e186bd 100644
--- a/puppet/modules/eventlogging/manifests/service.pp
+++ b/puppet/modules/eventlogging/manifests/service.pp
@@ -48,10 +48,15 @@
}
systemd::service { $service_name:
- ensure => 'present',
- template_name => 'eventlogging-service',
- service_params => {
+ ensure => 'present',
+ template_name => 'eventlogging-service',
+ service_params => {
subscribe => File[$config_file],
},
+ epp_template => true,
+ template_variables => {
+ 'eventlogging_path' => $eventlogging_path,
+ 'config_file' => $config_file,
+ },
}
}
diff --git
a/puppet/modules/eventlogging/templates/systemd/eventlogging-devserver.epp
b/puppet/modules/eventlogging/templates/systemd/eventlogging-devserver.epp
new file mode 100644
index 0000000..b16c8ae
--- /dev/null
+++ b/puppet/modules/eventlogging/templates/systemd/eventlogging-devserver.epp
@@ -0,0 +1,11 @@
+[Unit]
+Description=EventLogging Dev Server
+Requires=network.target
+
+[Service]
+User=www-data
+Group=www-data
+ExecStart=<%= $eventlogging_path %>/virtualenv/bin/eventlogging-devserver
--append-to <%= $output_file %>
+
+[Install]
+WantedBy=multi-user.target
diff --git
a/puppet/modules/eventlogging/templates/systemd/eventlogging-devserver.erb
b/puppet/modules/eventlogging/templates/systemd/eventlogging-devserver.erb
deleted file mode 100644
index 7befeaf..0000000
--- a/puppet/modules/eventlogging/templates/systemd/eventlogging-devserver.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=EventLogging Dev Server
-Requires=network.target
-
-[Service]
-User=www-data
-Group=www-data
-ExecStart=<%= @eventlogging_path %>/virtualenv/bin/eventlogging-devserver
--append-to <%= @output_file %>
-
-[Install]
-WantedBy=multi-user.target
diff --git
a/puppet/modules/eventlogging/templates/systemd/eventlogging-service.erb
b/puppet/modules/eventlogging/templates/systemd/eventlogging-service.epp
similarity index 62%
rename from
puppet/modules/eventlogging/templates/systemd/eventlogging-service.erb
rename to puppet/modules/eventlogging/templates/systemd/eventlogging-service.epp
index 76d1689..fed374a 100644
--- a/puppet/modules/eventlogging/templates/systemd/eventlogging-service.erb
+++ b/puppet/modules/eventlogging/templates/systemd/eventlogging-service.epp
@@ -5,7 +5,7 @@
[Service]
User=www-data
Group=www-data
-ExecStart=<%= @eventlogging_path %>/virtualenv/bin/eventlogging-service @<%=
@config_file %>
+ExecStart=<%= $eventlogging_path %>/virtualenv/bin/eventlogging-service @<%=
$config_file %>
[Install]
WantedBy=multi-user.target
--
To view, visit https://gerrit.wikimedia.org/r/399432
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I483a174632ba6928b408b13188683c5167ad47b8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: Gilles <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
