ArielGlenn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/96476
Change subject: remove last entries for ms7, going away at last
......................................................................
remove last entries for ms7, going away at last
Change-Id: I25001be30e555451ea371309c17a965e5de5a16a
---
M files/dsh/group/ALL
M files/dsh/group/pmtpa
M manifests/nfs.pp
D modules/generic/files/upstart/rsync-images.conf
4 files changed, 0 insertions(+), 25 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/76/96476/1
diff --git a/files/dsh/group/ALL b/files/dsh/group/ALL
index 3e401d1..906d334 100644
--- a/files/dsh/group/ALL
+++ b/files/dsh/group/ALL
@@ -129,7 +129,6 @@
clematis
ms5
ms6
-ms7
ms8
sql-text1
sql-text3
diff --git a/files/dsh/group/pmtpa b/files/dsh/group/pmtpa
index 6806791..9f119dc 100644
--- a/files/dsh/group/pmtpa
+++ b/files/dsh/group/pmtpa
@@ -27,7 +27,6 @@
lvs4
ms5
ms6
-ms7
ms8
mw1
mw2
diff --git a/manifests/nfs.pp b/manifests/nfs.pp
index 18da373..14040ae 100644
--- a/manifests/nfs.pp
+++ b/manifests/nfs.pp
@@ -198,13 +198,6 @@
options => "bg,soft,tcp,timeo=14,intr,nfsvers=3",
require => File["/mnt/thumbs"],
ensure => absent;
- "/mnt/upload6":
- device => "ms7.pmtpa.wmnet:/export/upload",
- fstype => "nfs",
- name => "/mnt/upload6",
- options =>
"bg,soft,udp,rsize=8192,wsize=8192,timeo=14,intr,nfsvers=3",
- require => File["/mnt/upload6"],
- ensure => absent;
}
}
diff --git a/modules/generic/files/upstart/rsync-images.conf
b/modules/generic/files/upstart/rsync-images.conf
deleted file mode 100644
index 403b246..0000000
--- a/modules/generic/files/upstart/rsync-images.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-# rsync-images
-# This file is managed by Puppet!
-
-description "On-going rsync of images from ms7 to ms1002"
-author "Mark Bergsma <[email protected]>"
-
-start on filesystem
-stop on runlevel [!2345]
-
-exec rsync -rltDp --del --stats --include-from=/etc/rsync.includes
ms7.pmtpa.wmnet::export/upload /export
-respawn
-respawn limit 3 300
-
-nice 10
-oom 10
-
--
To view, visit https://gerrit.wikimedia.org/r/96476
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I25001be30e555451ea371309c17a965e5de5a16a
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
