Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/315891
Change subject: decom palladium from puppet, install_server, network constants
......................................................................
decom palladium from puppet, install_server, network constants
Bug: T147320
Change-Id: Ic0654f8571cd6cbd3d344f26312082779c8e8c29
---
D files/palladium_deprecation
M manifests/site.pp
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
M modules/network/manifests/constants.pp
5 files changed, 1 insertion(+), 57 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/91/315891/1
diff --git a/files/palladium_deprecation b/files/palladium_deprecation
deleted file mode 100755
index 4fac389..0000000
--- a/files/palladium_deprecation
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-cat <<'MOTD'
- _ _ _ ___ _____ _ _ _
- __| | ___ | \ | |/ _ \_ _| _ _ ___ ___ | |_| |__ (_)___
-/ _` |/ _ \ | \| | | | || | | | | / __|/ _ \ | __| '_ \| / __|
-| (_| | (_) | | |\ | |_| || | | |_| \__ \ __/ | |_| | | | \__ \
- \__,_|\___/ |_| \_|\___/ |_| \__,_|___/\___| \__|_| |_|_|___/
-
- _
- ___ ___ _ ____ _____ _ __| |
-/ __|/ _ \ '__\ \ / / _ \ '__| |
-\__ \ __/ | \ V / __/ | |_|
-|___/\___|_| \_/ \___|_| (_)
-
-
-While it is still working, palladium is NOT the proper server anymore
-
-Head over to puppetmaster1001 or puppetmaster1002. Look at the following
-legend to see where to head to:
-
- * PUPPET CERT SIGNING: should be done ONLY on puppetmaster1001
- * REIMAGING: should be done on neodymium, using the automated script Riccardo
is working on, or on puppetmaster1001 only
- * CONFCTL: can be done on any puppetmaster frontend, so
puppetmaster1001.eqiad.wmnet or puppetmaster2001.eqiad.wmnet
- * PUPPET-MERGE: can be done on any puppetmaster frontend, so
puppetmaster1001 or puppetmaster2001
- * GIT PRIVATE: can be edited from any puppetmaster frontend, so
puppetmaster1001 or puppetmaster2001
- * VOLATILE: can be populated ONLY on puppetmaster1001
-
-MOTD
diff --git a/manifests/site.pp b/manifests/site.pp
index 6b7f891..e867040 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2352,24 +2352,6 @@
include standard
}
-# Former primary puppet master - to be decommissioned
-node 'palladium.eqiad.wmnet' {
- role(ipmi::mgmt, access_new_install)
- include standard
- include base::firewall
- include role::conftool::master
- interface::add_ip6_mapped { 'main':
- interface => 'eth0',
- }
- # lint:ignore:puppet_url_without_modules
- motd::script { 'deprecation_warning':
- ensure => present,
- priority => 01,
- source => 'puppet:///files/palladium_deprecation',
- }
- # lint:endignore
-}
-
# parser cache databases
# eqiad
node 'pc1004.eqiad.wmnet' {
diff --git a/modules/install_server/files/autoinstall/netboot.cfg
b/modules/install_server/files/autoinstall/netboot.cfg
index 61d374a..b9b4bb3 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -54,7 +54,7 @@
analytics102[8-9]|analytics103[0-9]|analytics104[0-9]|analytics105[0-9]) echo
partman/analytics-flex.cfg ;; \
aqs100[123]) echo partman/raid1-30G.cfg ;; \
aqs100[456]) echo partman/aqs-cassandra-8ssd-2srv.cfg ;; \
- arsenic|heze|neodymium|oxygen|palladium|promethium|strontium|terbium)
echo partman/lvm.cfg ;; \
+ arsenic|heze|neodymium|oxygen|promethium|strontium|terbium) echo
partman/lvm.cfg ;; \
copper|neon|ruthenium|subra|suhail|ocg1003) echo partman/raid1-lvm.cfg
;; \
bast[1234]*) echo partman/raid1-lvm-ext4-srv.cfg ;; \
californium|dbproxy10[0-1][0-9]|install2001|iridium) echo
partman/raid1.cfg ;; \
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index a826674..709a053 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -5603,13 +5603,6 @@
fixed-address oxygen.eqiad.wmnet;
}
-host palladium {
- hardware ethernet 18:03:73:f1:59:2d;
- fixed-address palladium.eqiad.wmnet;
- option pxelinux.pathprefix "precise-installer/";
- filename "precise-installer/ubuntu-installer/amd64/pxelinux.0";
-}
-
host pc1004 {
hardware ethernet 14:18:77:42:DF:00;
fixed-address pc1004.eqiad.wmnet;
diff --git a/modules/network/manifests/constants.pp
b/modules/network/manifests/constants.pp
index 35c3b6b..8e0e525 100644
--- a/modules/network/manifests/constants.pp
+++ b/modules/network/manifests/constants.pp
@@ -65,8 +65,6 @@
'2620:0:860:104:10:192:48:45', # wasat.codfw.wmnet
],
'puppet_frontends' => [
- '10.64.16.160', # palladium.eqiad.wmnet
- '2620:0:861:102:10:64:16:16', # palladium.eqiad.wmnet
'10.64.16.73', #
puppetmaster1001.eqiad.wmnet
'2620:0:861:102:10:64:16:73', #
puppetmaster1001.eqiad.wmnet
'10.192.0.27', #
puppetmaster2001.codfw.wmnet
--
To view, visit https://gerrit.wikimedia.org/r/315891
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic0654f8571cd6cbd3d344f26312082779c8e8c29
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
