Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/120615
Change subject: decom snapshot1-4
......................................................................
decom snapshot1-4
remove from:
-dsh groups
-puppet site.pp
-dataset files/exports config
-DHCP
Change-Id: Id4952ead057e041b37a99504b4a5170f92a3a676
---
M files/dsh/group/ALL
M files/dsh/group/pmtpa
M files/dsh/group/snapshot
M manifests/site.pp
M modules/dataset/files/exports
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600
6 files changed, 1 insertion(+), 44 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/15/120615/1
diff --git a/files/dsh/group/ALL b/files/dsh/group/ALL
index 0b8b6e8..2866df6 100644
--- a/files/dsh/group/ALL
+++ b/files/dsh/group/ALL
@@ -58,10 +58,6 @@
sql-text17
sql-text18
sql-text19
-snapshot1
-snapshot2
-snapshot3
-snapshot4
snapshot1001
snapshot1002
snapshot1003
diff --git a/files/dsh/group/pmtpa b/files/dsh/group/pmtpa
index 18d092f..ffa526e 100644
--- a/files/dsh/group/pmtpa
+++ b/files/dsh/group/pmtpa
@@ -20,7 +20,3 @@
pdf2
pdf3
-snapshot1
-snapshot2
-snapshot3
-snapshot4
diff --git a/files/dsh/group/snapshot b/files/dsh/group/snapshot
index 633b09c..3beafbc 100644
--- a/files/dsh/group/snapshot
+++ b/files/dsh/group/snapshot
@@ -1,7 +1,3 @@
-snapshot1
-snapshot2
-snapshot3
-snapshot4
snapshot1001
snapshot1002
snapshot1003
diff --git a/manifests/site.pp b/manifests/site.pp
index 6354c94..70dd889 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2429,17 +2429,6 @@
include role::analytics::clients
}
-# pmtpa to go away soon
-node /^snapshot[1-3]\.pmtpa\.wmnet/ {
- $gid= '500'
- include snapshot
-}
-node 'snapshot4.pmtpa.wmnet' {
- $gid= '500'
- include snapshot
- include role::snapshot::cron::secondary
-}
-
node 'snapshot1001.eqiad.wmnet' {
$gid= '500'
include snapshot
diff --git a/modules/dataset/files/exports b/modules/dataset/files/exports
index 9b304ec..8b999cb 100644
--- a/modules/dataset/files/exports
+++ b/modules/dataset/files/exports
@@ -8,4 +8,4 @@
# /srv/nfs4 gss/krb5i(rw,sync,fsid=0,crossmnt,no_subtree_check)
# /srv/nfs4/homes gss/krb5i(rw,sync,no_subtree_check)
#
-/data snapshot1.pmtpa.wmnet(rw,async,no_root_squash,no_subtree_check)
snapshot2.pmtpa.wmnet(rw,async,no_root_squash,no_subtree_check)
snapshot3.pmtpa.wmnet(rw,async,no_root_squash,no_subtree_check)
snapshot4.pmtpa.wmnet(rw,async,no_root_squash,no_subtree_check)
snapshot1001.eqiad.wmnet(rw,async,no_root_squash,no_subtree_check)
snapshot1002.eqiad.wmnet(rw,async,no_root_squash,no_subtree_check)
snapshot1003.eqiad.wmnet(rw,async,no_root_squash,no_subtree_check)
snapshot1004.eqiad.wmnet(rw,async,no_root_squash,no_subtree_check)
stat1.wikimedia.org(ro,async,no_root_squash,no_subtree_check)
stat1002.eqiad.wmnet(ro,async,no_root_squash,no_subtree_check)
+/data snapshot1001.eqiad.wmnet(rw,async,no_root_squash,no_subtree_check)
snapshot1002.eqiad.wmnet(rw,async,no_root_squash,no_subtree_check)
snapshot1003.eqiad.wmnet(rw,async,no_root_squash,no_subtree_check)
snapshot1004.eqiad.wmnet(rw,async,no_root_squash,no_subtree_check)
stat1.wikimedia.org(ro,async,no_root_squash,no_subtree_check)
stat1002.eqiad.wmnet(ro,async,no_root_squash,no_subtree_check)
diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600
index 5fe631f..2d9ba1b 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600
@@ -63,26 +63,6 @@
fixed-address sanger.wikimedia.org;
}
-host snapshot1 {
- hardware ethernet 00:21:9b:8e:95:50;
- fixed-address snapshot1.pmtpa.wmnet;
-}
-
-host snapshot2 {
- hardware ethernet 00:21:9b:8e:93:a2;
- fixed-address snapshot2.pmtpa.wmnet;
-}
-
-host snapshot3 {
- hardware ethernet 00:21:9b:8e:95:0a;
- fixed-address snapshot3.pmtpa.wmnet;
-}
-
-host snapshot4 {
- hardware ethernet f0:4d:a2:40:b5:72;
- fixed-address snapshot4.pmtpa.wmnet;
-}
-
host srv193 {
hardware ethernet 00:21:9B:8B:D9:7A;
fixed-address srv193.pmtpa.wmnet;
--
To view, visit https://gerrit.wikimedia.org/r/120615
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id4952ead057e041b37a99504b4a5170f92a3a676
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
