Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/405229 )
Change subject: bast3002->bast3003 in DHCP,network constants,smokeping
......................................................................
bast3002->bast3003 in DHCP,network constants,smokeping
Bug: T184936
Change-Id: I56e6afd6b303f78a11b24f1c9979a7fce4f9991e
---
M modules/install_server/files/dhcpd/dhcpd.conf
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
M modules/network/manifests/constants.pp
M modules/smokeping/files/config.d/Targets
4 files changed, 7 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/29/405229/1
diff --git a/modules/install_server/files/dhcpd/dhcpd.conf
b/modules/install_server/files/dhcpd/dhcpd.conf
index a00ec99..79ce693 100644
--- a/modules/install_server/files/dhcpd/dhcpd.conf
+++ b/modules/install_server/files/dhcpd/dhcpd.conf
@@ -356,7 +356,7 @@
option domain-name "wikimedia.org";
option domain-name-servers 91.198.174.216, 208.80.154.254; # esams, eqiad
caches
- next-server 91.198.174.113; # bast3002 (tftp server)
+ next-server 91.198.174.115; # bast3003 (tftp server)
}
# private1-esams subnet
@@ -369,7 +369,7 @@
option domain-name "esams.wmnet";
option domain-name-servers 91.198.174.6, 208.80.154.254; # esams, eqiad
caches
- next-server 91.198.174.113; # bast3002 (tftp server)
+ next-server 91.198.174.115; # bast3003 (tftp server)
}
# mgmt1-esams subnet
@@ -384,7 +384,7 @@
option domain-name "mgmt.esams.wmnet";
option domain-name-servers 91.198.174.216, 208.80.154.254; # esams, eqiad
caches
- next-server 91.198.174.113; # bast3002 (tftp server)
+ next-server 91.198.174.115; # bast3003 (tftp server)
}
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 4b8830a..cbf9572 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -410,15 +410,6 @@
filename "lpxelinux.0";
}
-host bast3002 {
- hardware ethernet a4:ba:db:30:d7:70;
- fixed-address bast3002.wikimedia.org;
-
- next-server 208.80.154.22; # install1002 (tftp server)
- option pxelinux.pathprefix
"http://apt.wikimedia.org/tftpboot/jessie-installer/";;
- filename "lpxelinux.0";
-}
-
host bast3003 {
hardware ethernet 24:B6:FD:F6:13:AC;
fixed-address bast3003.wikimedia.org;
diff --git a/modules/network/manifests/constants.pp
b/modules/network/manifests/constants.pp
index efe5506..f0164bb 100644
--- a/modules/network/manifests/constants.pp
+++ b/modules/network/manifests/constants.pp
@@ -34,8 +34,6 @@
'2620:0:861:2:208:80:154:149', #
bast1001.wikimedia.org
'208.80.153.5', #
bast2001.wikimedia.org
'2620:0:860:1:208:80:153:5', #
bast2001.wikimedia.org
- '91.198.174.113', #
bast3002.wikimedia.org
- '2620:0:862:1:91:198:174:113', #
bast3002.wikimedia.org
'198.35.26.5', #
bast4001.wikimedia.org
'2620:0:863:1:198:35:26:5', #
bast4001.wikimedia.org
'198.35.26.6', #
bast4002.wikimedia.org
diff --git a/modules/smokeping/files/config.d/Targets
b/modules/smokeping/files/config.d/Targets
index f34b969..d1f0055 100644
--- a/modules/smokeping/files/config.d/Targets
+++ b/modules/smokeping/files/config.d/Targets
@@ -274,10 +274,10 @@
menu = Hosts
title = Sampled Hosts
-+++ bast3002
-menu = bast3002
-title = bast3002.wikimedia.org
-host = bast3002.wikimedia.org
++++ bast3003
+menu = bast3003
+title = bast3003.wikimedia.org
+host = bast3003.wikimedia.org
+ ulsfo
--
To view, visit https://gerrit.wikimedia.org/r/405229
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I56e6afd6b303f78a11b24f1c9979a7fce4f9991e
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
