ArielGlenn has submitted this change and it was merged.
Change subject: swap classes on snapshot1002 for cron dump run job
......................................................................
swap classes on snapshot1002 for cron dump run job
avoid conflicts with old and refactored classes
Change-Id: I78951b7a26f0a37ab08459340629b711b4072834
---
M manifests/site.pp
A modules/role/manifests/snapshot/cron.pp
M modules/role/manifests/snapshot/dumper.pp
3 files changed, 6 insertions(+), 2 deletions(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index be0f0a7..742af1b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2480,7 +2480,7 @@
# NOTE: New snapshot hosts must also be manually added
# to hiera common.yaml dataset_clients_snapshots.
- role snapshot, snapshot::dumps::regularwikis
+ role snapshot, snapshot::cron
include standard
}
diff --git a/modules/role/manifests/snapshot/cron.pp
b/modules/role/manifests/snapshot/cron.pp
new file mode 100644
index 0000000..53298db
--- /dev/null
+++ b/modules/role/manifests/snapshot/cron.pp
@@ -0,0 +1,4 @@
+class role::snapshot::cron {
+ include dataset::user
+ class { 'snapshot::dumps::cron': user => 'datasets' }
+}
diff --git a/modules/role/manifests/snapshot/dumper.pp
b/modules/role/manifests/snapshot/dumper.pp
index ef6b453..87af64f 100644
--- a/modules/role/manifests/snapshot/dumper.pp
+++ b/modules/role/manifests/snapshot/dumper.pp
@@ -13,5 +13,5 @@
include snapshot::deployment
# cron job for running the dumps
- class { 'snapshot::dumps::cron': user => 'datasets' }
+ include role::snapshot::cron
}
--
To view, visit https://gerrit.wikimedia.org/r/281668
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I78951b7a26f0a37ab08459340629b711b4072834
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <[email protected]>
Gerrit-Reviewer: ArielGlenn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
