ArielGlenn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/282132
Change subject: remove now outdated scap dir setup and keyholder from snapshot
manifests
......................................................................
remove now outdated scap dir setup and keyholder from snapshot manifests
they are handled in hieradata/common/scap now
Change-Id: Id885fdf8a37db704c48f77300fce0b4be9ba1fa4
---
D modules/snapshot/manifests/deployment/dirs.pp
D modules/snapshot/manifests/deployment/source.pp
2 files changed, 0 insertions(+), 42 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/32/282132/1
diff --git a/modules/snapshot/manifests/deployment/dirs.pp
b/modules/snapshot/manifests/deployment/dirs.pp
deleted file mode 100644
index 4ce77db..0000000
--- a/modules/snapshot/manifests/deployment/dirs.pp
+++ /dev/null
@@ -1,31 +0,0 @@
-class snapshot::deployment::dirs {
- $repodir = '/srv/deployment/dumps/dumps'
-
- file { "${repodir}/scap":
- ensure => 'directory',
- path => "${repodir}/scap",
- mode => '0775',
- owner => trebuchet,
- group => wikidev,
- }
-
- file { "${repodir}/scap/scap.cfg":
- mode => '0644',
- owner => root,
- group => root,
- source => 'puppet:///modules/snapshot/deployment/scap.cfg'
- }
-
- $targets = [
- 'snapshot1005.eqiad.wmnet',
- 'snapshot1006.eqiad.wmnet',
- 'snapshot1007.eqiad.wmnet'
- ]
- $target_str = join($targets, "\n")
- file { "${repodir}/scap/dumps_targets":
- mode => '0644',
- owner => root,
- group => root,
- content => "${target_str}\n",
- }
-}
diff --git a/modules/snapshot/manifests/deployment/source.pp
b/modules/snapshot/manifests/deployment/source.pp
deleted file mode 100644
index 89d34e2..0000000
--- a/modules/snapshot/manifests/deployment/source.pp
+++ /dev/null
@@ -1,11 +0,0 @@
-class snapshot::deployment::source {
- include snapshot::deployment::dirs
-
- require ::keyholder
- require ::keyholder::monitoring
-
- keyholder::agent { 'dumpsdeploy':
- trusted_group => 'ops',
- key_fingerprint => '86:c9:17:ab:b7:00:79:b5:8a:c5:b5:ee:29:24:c9:2f',
- }
-}
--
To view, visit https://gerrit.wikimedia.org/r/282132
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id885fdf8a37db704c48f77300fce0b4be9ba1fa4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
