Filippo Giunchedi has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/345377 )
Change subject: Add 3d2png deploy repo to image scalers
......................................................................
Add 3d2png deploy repo to image scalers
Adds 3d2png to both Thumbor image scalers as well as MediaWiki
imagescalers. Since MediaWiki appservers already have the mwdeploy user
and group, there is no need for scap::target to manage the mwdeploy
user/group. This is not the case for Thumbor servers.
Bug: T160185
Change-Id: Ib48d47bb0afef51ad710a0578427eb43d46b6b10
---
M hieradata/labs/deployment-prep/common.yaml
M hieradata/role/common/deployment_server.yaml
A modules/3d2png/manifests/deploy.pp
M modules/role/manifests/mediawiki/imagescaler.pp
M modules/role/manifests/thumbor/mediawiki.pp
5 files changed, 29 insertions(+), 0 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, but someone else must approve
jenkins-bot: Verified
Filippo Giunchedi: Looks good to me, approved
diff --git a/hieradata/labs/deployment-prep/common.yaml
b/hieradata/labs/deployment-prep/common.yaml
index 9ce5f2b..73905fd 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -299,6 +299,8 @@
# by the role deployment::server. Each source listed here
# will be cloned on the scap deploy server.
scap::sources:
+ 3d2png/deploy:
+ repository: 3d2png/deploy
phabricator/deployment:
repository: phabricator/deployment
diff --git a/hieradata/role/common/deployment_server.yaml
b/hieradata/role/common/deployment_server.yaml
index ee5dfa7..0bf4c3b 100644
--- a/hieradata/role/common/deployment_server.yaml
+++ b/hieradata/role/common/deployment_server.yaml
@@ -80,6 +80,8 @@
# by the scap::server class. Each source listed here
# will be cloned on the scap deploy server.
scap::sources:
+ 3d2png/deploy:
+ repository: 3d2png/deploy
analytics/refinery:
repository: analytics/refinery
scap_repository: analytics/refinery/scap
diff --git a/modules/3d2png/manifests/deploy.pp
b/modules/3d2png/manifests/deploy.pp
new file mode 100644
index 0000000..25c9e34
--- /dev/null
+++ b/modules/3d2png/manifests/deploy.pp
@@ -0,0 +1,20 @@
+# == Class: 3d2png::deploy
+#
+# Deploy 3d2png via scap
+#
+# === Parameters
+# [*manage_user*]
+# boolean - should scap add mwdeploy user
+class 3d2png::deploy (
+ $manage_user = false,
+) {
+ require_package('nodejs', 'nodejs-legacy', 'xvfb', 'xauth',
'libgl1-mesa-dri')
+
+ # When installed alongside a mediawiki imagescaler there is no need to add
+ # the mwdeploy user and group; however, that is not the case on thumbor
+ # machines.
+ scap::target { '3d2png/deploy':
+ deploy_user => 'mwdeploy',
+ manage_user => $manage_user,
+ }
+}
diff --git a/modules/role/manifests/mediawiki/imagescaler.pp
b/modules/role/manifests/mediawiki/imagescaler.pp
index c359caf..72851d7 100644
--- a/modules/role/manifests/mediawiki/imagescaler.pp
+++ b/modules/role/manifests/mediawiki/imagescaler.pp
@@ -6,5 +6,6 @@
include ::profile::prometheus::apache_exporter
include ::profile::prometheus::hhvm_exporter
include ::base::firewall
+ include ::3d2png::deploy
}
diff --git a/modules/role/manifests/thumbor/mediawiki.pp
b/modules/role/manifests/thumbor/mediawiki.pp
index 83a4e84..0d99881 100644
--- a/modules/role/manifests/thumbor/mediawiki.pp
+++ b/modules/role/manifests/thumbor/mediawiki.pp
@@ -44,4 +44,8 @@
port => '11211',
srange => "(@resolve((${thumbor_memcached_servers_ferm})))",
}
+
+ class { '3d2png::deploy':
+ manage_user => true,
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/345377
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib48d47bb0afef51ad710a0578427eb43d46b6b10
Gerrit-PatchSet: 22
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: MarkTraceur <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Gilles <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Matthias Mullie <[email protected]>
Gerrit-Reviewer: Mobrovac <[email protected]>
Gerrit-Reviewer: Thcipriani <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
