Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: pdfrender: disable by default in eqiad
......................................................................
pdfrender: disable by default in eqiad
Change-Id: Ifaaf62f52832a6b6afd06ffcfb8e6863bef315bc
---
A hieradata/role/codfw/scb.yaml
M modules/pdfrender/manifests/init.pp
M modules/role/manifests/pdfrender.pp
3 files changed, 24 insertions(+), 8 deletions(-)
Approvals:
Giuseppe Lavagetto: Verified; Looks good to me, approved
diff --git a/hieradata/role/codfw/scb.yaml b/hieradata/role/codfw/scb.yaml
new file mode 100644
index 0000000..d6b6131
--- /dev/null
+++ b/hieradata/role/codfw/scb.yaml
@@ -0,0 +1 @@
+role::pdfrender::is_active: true
diff --git a/modules/pdfrender/manifests/init.pp
b/modules/pdfrender/manifests/init.pp
index 14522fb..a1a48ca 100644
--- a/modules/pdfrender/manifests/init.pp
+++ b/modules/pdfrender/manifests/init.pp
@@ -8,6 +8,9 @@
# [*port*]
# The port to bind the service to.
#
+# [*running*]
+# Should the service be running or not.
+#
# [*width*]
# The default browser width to use when converting, if not specified in the
# request. Default: 1024
@@ -25,6 +28,7 @@
#
class pdfrender(
$port,
+ $running,
$width = 1024,
$height = 768,
$no_browsers = 1,
@@ -42,9 +46,11 @@
'libxss1', 'libnss3', 'libgconf2-4', 'libgtk2.0-0', 'libasound2',
'xpra')
- monitoring::service { 'pdfrender':
- description => 'pdfrender',
- check_command => "check_http_on_port!${port}",
+ if ($running) {
+ monitoring::service { 'pdfrender':
+ description => 'pdfrender',
+ check_command => "check_http_on_port!${port}",
+ }
}
scap::target { 'electron-render/deploy':
@@ -101,9 +107,17 @@
before => Base::Service_unit['pdfrender'],
}
- base::service_unit { 'pdfrender':
- ensure => present,
- systemd => true,
+ $params = {
+ ensure => $running ? {
+ true => 'running',
+ default => 'stopped',
+ },
+ enable => $running,
}
+ base::service_unit { 'pdfrender':
+ ensure => present,
+ systemd => true,
+ service_params => $params,
+ }
}
diff --git a/modules/role/manifests/pdfrender.pp
b/modules/role/manifests/pdfrender.pp
index 2e3d920..76336d4 100644
--- a/modules/role/manifests/pdfrender.pp
+++ b/modules/role/manifests/pdfrender.pp
@@ -1,4 +1,5 @@
class role::pdfrender {
+ $is_active = hiera('role::pdfrender::is_active', false)
system::role { 'role::pdfrender':
description => 'A PDF render service based on Electron',
@@ -7,7 +8,8 @@
$port = 5252
class { '::pdfrender':
- port => $port,
+ port => $port,
+ running => $is_active,
}
ferm::service { "pdfrender_http_${port}":
@@ -17,4 +19,3 @@
}
}
-
--
To view, visit https://gerrit.wikimedia.org/r/322888
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifaaf62f52832a6b6afd06ffcfb8e6863bef315bc
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Mobrovac <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
