Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/115527
Change subject: remove sockpuppet from puppet
......................................................................
remove sockpuppet from puppet
remove sockpuppet from:
-backup files
-dsh groups
-site.pp
-install-server/dhcp
-puppet-merge script
-post-merge template
also follow-up to RT #6175
and to get out of Tampa
sockpuppet is not puppetmaster anymore,
and neither is it saltmaster.
see how it is commented already in role/salt.pp
so it doesn't select a site anymore but is always
palladium
< Ryan_Lane> sockpuppet isn't master for anything anymore, then
< bblack> palladium does salt
but if we want to keep this as some kind of fall-over until the
end then just don't merge it yet but use it later?
Change-Id: I773c188f865880e50fb4b643fb47ae50e4cec03d
---
M files/backup/disklist-daily
M files/backup/disklist-monthly
M files/backup/disklist-weekly
M files/dsh/group/ALL
M files/dsh/group/misc_pmtpa
M files/dsh/group/pmtpa
M manifests/admins.pp
M manifests/site.pp
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600
M modules/puppetmaster/files/puppet-merge
M modules/puppetmaster/templates/post-merge.erb
11 files changed, 1 insertion(+), 42 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/27/115527/1
diff --git a/files/backup/disklist-daily b/files/backup/disklist-daily
index 5b44107..8d6f483 100644
--- a/files/backup/disklist-daily
+++ b/files/backup/disklist-daily
@@ -1,6 +1,4 @@
mchenry.wikimedia.org /root default
-sockpuppet.pmtpa.wmnet /svnroot default
-sockpuppet.pmtpa.wmnet /var/lib/puppet/ssl default
db10.pmtpa.wmnet /a/sqldata {
default
include "./db10-bin.*"
diff --git a/files/backup/disklist-monthly b/files/backup/disklist-monthly
index 0b9212d..4420288 100644
--- a/files/backup/disklist-monthly
+++ b/files/backup/disklist-monthly
@@ -1,6 +1,4 @@
mchenry.wikimedia.org /root default
-sockpuppet.pmtpa.wmnet /svnroot default
-sockpuppet.pmtpa.wmnet /var/lib/puppet/ssl default
db10.pmtpa.wmnet /mnt/a default
stat1.wikimedia.org /home default
stat1.wikimedia.org /a/eventlogging default
diff --git a/files/backup/disklist-weekly b/files/backup/disklist-weekly
index 0b9212d..4420288 100644
--- a/files/backup/disklist-weekly
+++ b/files/backup/disklist-weekly
@@ -1,6 +1,4 @@
mchenry.wikimedia.org /root default
-sockpuppet.pmtpa.wmnet /svnroot default
-sockpuppet.pmtpa.wmnet /var/lib/puppet/ssl default
db10.pmtpa.wmnet /mnt/a default
stat1.wikimedia.org /home default
stat1.wikimedia.org /a/eventlogging default
diff --git a/files/dsh/group/ALL b/files/dsh/group/ALL
index c41e2ca..347a72b 100644
--- a/files/dsh/group/ALL
+++ b/files/dsh/group/ALL
@@ -110,7 +110,6 @@
snapshot1003
snapshot1004
tridge
-sockpuppet
brewster
dobson
linne
diff --git a/files/dsh/group/misc_pmtpa b/files/dsh/group/misc_pmtpa
index 9628729..c5a41d5 100644
--- a/files/dsh/group/misc_pmtpa
+++ b/files/dsh/group/misc_pmtpa
@@ -14,7 +14,6 @@
pdf2
pdf3
sanger
-sockpuppet
stafford
stat1
tarin
diff --git a/files/dsh/group/pmtpa b/files/dsh/group/pmtpa
index 1961e2a..a98cab9 100644
--- a/files/dsh/group/pmtpa
+++ b/files/dsh/group/pmtpa
@@ -7,7 +7,6 @@
linne
mchenry
sanger
-sockpuppet
stafford
tarin
tridge
diff --git a/manifests/admins.pp b/manifests/admins.pp
index 376e953..0d7ba84 100644
--- a/manifests/admins.pp
+++ b/manifests/admins.pp
@@ -3469,7 +3469,7 @@
include groups::wikidev
# In addition to adding the user to this list, you MUST add the user's
key
- # to /root/private/files/ssh/root-authorized-keys on sockpuppet, then
git
+ # to /root/private/files/ssh/root-authorized-keys on palladium, then git
# commit and pull to /var/lib/git/operations/private/ on stafford, to
# actually get them root; that file is not in the public repo.
diff --git a/manifests/site.pp b/manifests/site.pp
index ca22db7..9cb7441 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2295,20 +2295,6 @@
include mobile::vumi::udp2log
}
-node 'sockpuppet.pmtpa.wmnet' {
- include standard
- include backup::client
- include misc::management::ipmi
- include role::salt::masters::production
- include role::deployment::salt_masters::production
-
- # Display notice that this is no longer an active puppetmaster.
- file { '/etc/update-motd.d/99-obsolete-puppetmaster':
- ensure => 'present',
- source => 'puppet:///modules/puppetmaster/motd/99-obsolete',
- }
-}
-
node 'sodium.wikimedia.org' {
$nameservers_prefix = [ $ipaddress ]
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 4b46ec4..c0dc8a1 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600
@@ -113,11 +113,6 @@
fixed-address snapshot4.pmtpa.wmnet;
}
-host sockpuppet {
- hardware ethernet 00:1e:c9:ea:53:ee;
- fixed-address sockpuppet.pmtpa.wmnet;
-}
-
host srv193 {
hardware ethernet 00:21:9B:8B:D9:7A;
fixed-address srv193.pmtpa.wmnet;
diff --git a/modules/puppetmaster/files/puppet-merge
b/modules/puppetmaster/files/puppet-merge
index 5d7f105..b3217af 100755
--- a/modules/puppetmaster/files/puppet-merge
+++ b/modules/puppetmaster/files/puppet-merge
@@ -10,16 +10,6 @@
MAGENTA=$(tput bold; tput setaf 9)
RESET=$(tput sgr0)
-
-# TODO: Remove this after sockpuppet is dead
-if [ `hostname` = "sockpuppet" ]; then
- echo "You shouldn't run puppet-merge here. Sockpuppet is unused. Go to
palladium.eqiad.wmnet instead"
- read -p "force(N/y)? " answer
- if [ "$answer" != 'y' ]; then
- exit 1
- fi
-fi
-
usage="$(basename ${0}) [<basedir>]
Fetches changes from origin and from all submodules.
diff --git a/modules/puppetmaster/templates/post-merge.erb
b/modules/puppetmaster/templates/post-merge.erb
index 2c73d98..bbfad1d 100644
--- a/modules/puppetmaster/templates/post-merge.erb
+++ b/modules/puppetmaster/templates/post-merge.erb
@@ -13,8 +13,5 @@
<%- if worker == @fqdn then next end -%>
ssh -t -t <%= worker -%> 'cd /var/lib/git/operations/puppet && git pull
&& git submodule update --init'
<%- end -%>
- <%- elsif @fqdn == 'sockpuppet.pmtpa.wmnet' -%>
- # TODO: After migration delete the sockpuppet references
- ssh -t -t stafford.pmtpa.wmnet 'cd /var/lib/git/operations/puppet &&
git pull && git submodule update --init'
<%- end -%>
fi
--
To view, visit https://gerrit.wikimedia.org/r/115527
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I773c188f865880e50fb4b643fb47ae50e4cec03d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
