ArielGlenn has submitted this change and it was merged.
Change subject: create dumps testbed role for snapshot1001
......................................................................
create dumps testbed role for snapshot1001
also, use the mediawiki::common role instead of specific classes
from the mediawiki module
Bug: T149171
Change-Id: I3689068a70ea8fb3466f64da567085544e96e992
---
A hieradata/hosts/snapshot1001.yaml
M manifests/site.pp
M modules/role/manifests/snapshot/common.pp
A modules/role/manifests/snapshot/testbed.pp
M modules/snapshot/manifests/dumps/packages.pp
5 files changed, 17 insertions(+), 5 deletions(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/hosts/snapshot1001.yaml
b/hieradata/hosts/snapshot1001.yaml
new file mode 100644
index 0000000..8e2562f
--- /dev/null
+++ b/hieradata/hosts/snapshot1001.yaml
@@ -0,0 +1,4 @@
+snapshot::dumps::runtype: regular
+snapshot::dumps::maxjobs: 6
+snapshot::dumps::monitor: false
+snapshot::cron::misc: false
diff --git a/manifests/site.pp b/manifests/site.pp
index 4d7fcea..dde1f96 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2719,7 +2719,7 @@
}
node /^snapshot1001\.eqiad\.wmnet/ {
- # to be reinstalled for use as testbed/canary
+ role(snapshot::testbed)
include standard
}
diff --git a/modules/role/manifests/snapshot/common.pp
b/modules/role/manifests/snapshot/common.pp
index fe0adeb..e0ede90 100644
--- a/modules/role/manifests/snapshot/common.pp
+++ b/modules/role/manifests/snapshot/common.pp
@@ -5,6 +5,7 @@
# mw packages and dependencies, dataset server nfs mount,
# config files, stages files, dblists, html templates
+ include ::role::mediawiki::common
include snapshot::dumps
# scap3 deployment of dump scripts
diff --git a/modules/role/manifests/snapshot/testbed.pp
b/modules/role/manifests/snapshot/testbed.pp
new file mode 100644
index 0000000..0f32d66
--- /dev/null
+++ b/modules/role/manifests/snapshot/testbed.pp
@@ -0,0 +1,11 @@
+# this class is for snapshot test hosts which should
+# have all software and configuration needed to
+# generate sql/xml dumps without automatically running
+# them
+class role::snapshot::testbed {
+ include role::snapshot::common
+
+ system::role { 'role::snapshot::testbed':
+ description => 'testbed for dumps of XML/SQL wiki content',
+ }
+}
diff --git a/modules/snapshot/manifests/dumps/packages.pp
b/modules/snapshot/manifests/dumps/packages.pp
index 2a55824..4af86f7 100644
--- a/modules/snapshot/manifests/dumps/packages.pp
+++ b/modules/snapshot/manifests/dumps/packages.pp
@@ -1,8 +1,4 @@
class snapshot::dumps::packages {
- include ::mediawiki
- include mediawiki::nutcracker
- include mediawiki::scap
-
require_package('mwbzutils')
require_package('mysql-client')
require_package('p7zip-full')
--
To view, visit https://gerrit.wikimedia.org/r/318069
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3689068a70ea8fb3466f64da567085544e96e992
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <ar...@wikimedia.org>
Gerrit-Reviewer: ArielGlenn <ar...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
