BBlack has submitted this change and it was merged.
Change subject: move lvs200x to private subnet
......................................................................
move lvs200x to private subnet
Change-Id: Ia4f0db7813fe10eb850c79be413d5e7076d56879
---
M manifests/ganglia.pp
M manifests/site.pp
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
3 files changed, 16 insertions(+), 16 deletions(-)
Approvals:
BBlack: Verified; Looks good to me, approved
diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index 29dc171..68b0949 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -311,7 +311,7 @@
'Virtualization cluster eqiad' =>
'labnet1001.eqiad.wmnet virt1000.wikimedia.org',
'MySQL eqiad' => 'db1053.eqiad.wmnet
db1054.eqiad.wmnet db1057.eqiad.wmnet',
'LVS loadbalancers eqiad' => 'lvs1001.wikimedia.org
lvs1002.wikimedia.org',
- 'LVS loadbalancers codfw' =>
'install2001.wikimedia.org:10651 lvs2001.wikimedia.org lvs2002.wikimedia.org',
+ 'LVS loadbalancers codfw' =>
'install2001.wikimedia.org:10651 lvs2001.codfw.wmnet lvs2002.codfw.wmnet',
'Miscellaneous eqiad' => 'carbon.wikimedia.org
ms1004.eqiad.wmnet',
'Miscellaneous codfw' =>
'install2001.wikimedia.org:10657',
'Mobile caches eqiad' => 'cp1046.eqiad.wmnet
cp1047.eqiad.wmnet',
diff --git a/manifests/site.pp b/manifests/site.pp
index a2322d7..564192d 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1715,7 +1715,7 @@
}
# codfw lvs
-node /lvs200[1-6]\.wikimedia\.org/ {
+node /lvs200[1-6]\.codfw\.wmnet/ {
# XXX will need $nameservers_prefix hack eventually (see eqiad above)
@@ -1736,11 +1736,11 @@
case $::hostname {
/^lvs200[1-3]$/: {
# Row A subnets on eth0
- interface::tagged { 'eth0.2017':
+ interface::tagged { 'eth0.2001':
base_interface => 'eth0',
- vlan_id => '2017',
- address => $ips['private1-a-codfw'][$::hostname],
- netmask => '255.255.252.0',
+ vlan_id => '2001',
+ address => $ips['public1-a-codfw'][$::hostname],
+ netmask => '255.255.255.224',
}
# Row B subnets on eth1
interface::tagged { 'eth1.2002':
@@ -1758,11 +1758,11 @@
}
/^lvs200[4-6]$/: {
# Row B subnets on eth0
- interface::tagged { 'eth0.2018':
+ interface::tagged { 'eth0.2002':
base_interface => 'eth0',
- vlan_id => '2018',
- address => $ips['private1-b-codfw'][$::hostname],
- netmask => '255.255.252.0',
+ vlan_id => '2002',
+ address => $ips['public1-b-codfw'][$::hostname],
+ netmask => '255.255.255.224',
}
# Row A subnets on eth1
interface::tagged { 'eth1.2001':
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 cd4e80f..fdfd040 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -1729,32 +1729,32 @@
host lvs2001 {
hardware ethernet fc:15:b4:1f:ab:08;
- fixed-address lvs2001.wikimedia.org;
+ fixed-address lvs2001.codfw.wmnet;
}
host lvs2002 {
hardware ethernet fc:15:b4:21:3e:38;
- fixed-address lvs2002.wikimedia.org;
+ fixed-address lvs2002.codfw.wmnet;
}
host lvs2003 {
hardware ethernet fc:15:b4:1f:99:58;
- fixed-address lvs2003.wikimedia.org;
+ fixed-address lvs2003.codfw.wmnet;
}
host lvs2004 {
hardware ethernet fc:15:b4:1f:3b:00;
- fixed-address lvs2004.wikimedia.org;
+ fixed-address lvs2004.codfw.wmnet;
}
host lvs2005 {
hardware ethernet fc:15:b4:1f:5b:e8;
- fixed-address lvs2005.wikimedia.org;
+ fixed-address lvs2005.codfw.wmnet;
}
host lvs2006 {
hardware ethernet fc:15:b4:1f:19:18;
- fixed-address lvs2006.wikimedia.org;
+ fixed-address lvs2006.codfw.wmnet;
}
host lvs3001 {
--
To view, visit https://gerrit.wikimedia.org/r/160853
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia4f0db7813fe10eb850c79be413d5e7076d56879
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
