RobH has uploaded a new change for review.
https://gerrit.wikimedia.org/r/156210
Change subject: updating install-server module for new codfw rows and
install2001 params
......................................................................
updating install-server module for new codfw rows and install2001 params
adding in support for the new codfw rows in install-server module as
part of setting up install2001
Change-Id: I27d7455364b1566bcec6e329646b9d966dc8a6db
RT: 8201
---
M modules/install-server/files/autoinstall/netboot.cfg
A modules/install-server/files/autoinstall/subnets/private1-a-codfw.cfg
A modules/install-server/files/autoinstall/subnets/private1-b-codfw.cfg
A modules/install-server/files/autoinstall/subnets/private1-c-codfw.cfg
A modules/install-server/files/autoinstall/subnets/private1-d-codfw.cfg
A modules/install-server/files/autoinstall/subnets/public1-a-codfw.cfg
A modules/install-server/files/autoinstall/subnets/public1-b-codfw.cfg
A modules/install-server/files/autoinstall/subnets/public1-c-codfw.cfg
A modules/install-server/files/autoinstall/subnets/public1-d-codfw.cfg
M modules/install-server/files/dhcpd/dhcpd.conf
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
11 files changed, 219 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/10/156210/1
diff --git a/modules/install-server/files/autoinstall/netboot.cfg
b/modules/install-server/files/autoinstall/netboot.cfg
index 9290309..9f630ad 100755
--- a/modules/install-server/files/autoinstall/netboot.cfg
+++ b/modules/install-server/files/autoinstall/netboot.cfg
@@ -70,7 +70,7 @@
labsdb[1-3]|labsdb100[1-3]) echo partman/mw.cfg ;; \
labsdb100[45]) echo partman/osmlabsdb.cfg ;; \
labsdb100[67]) echo partman/raid5-gpt-lvm.cfg ;; \
-
dbproxy100[1-2]|francium|iridium|nickel|ocg100[1-3]|protactinium|radon|rbf100[1-2])
echo partman/raid1.cfg ;; \
+
dbproxy100[1-2]|francium|install2001|iridium|nickel|ocg100[1-3]|protactinium|radon|rbf100[1-2])
echo partman/raid1.cfg ;; \
rhenium) echo partman/raid1-gpt.cfg ;; \
osm-cp*) echo partman/mw.cfg ;; \
pc100[1-3]) echo partman/mw.cfg ;; \
diff --git
a/modules/install-server/files/autoinstall/subnets/private1-a-codfw.cfg
b/modules/install-server/files/autoinstall/subnets/private1-a-codfw.cfg
new file mode 100644
index 0000000..25f3884
--- /dev/null
+++ b/modules/install-server/files/autoinstall/subnets/private1-a-codfw.cfg
@@ -0,0 +1,15 @@
+# subnet specific configuration settings
+
+# get_domain should be set, get_hostname is overwritten by DHCP
+d-i netcfg/get_domain string eqiad.wmnet
+
+# ip address is taken from DHCP, rest is set here
+d-i netcfg/get_netmask string 255.255.252.0
+d-i netcfg/get_gateway string 10.192.0.1
+d-i netcfg/get_nameservers string 208.80.154.239 91.198.174.6
+d-i netcfg/confirm_static boolean true
+
+d-i mirror/http/proxy string http://webproxy.eqiad.wmnet:8080
+
+# NTP
+d-i clock-setup/ntp-server string ntp.eqiad.wmnet
diff --git
a/modules/install-server/files/autoinstall/subnets/private1-b-codfw.cfg
b/modules/install-server/files/autoinstall/subnets/private1-b-codfw.cfg
new file mode 100644
index 0000000..a7899ca
--- /dev/null
+++ b/modules/install-server/files/autoinstall/subnets/private1-b-codfw.cfg
@@ -0,0 +1,15 @@
+# subnet specific configuration settings
+
+# get_domain should be set, get_hostname is overwritten by DHCP
+d-i netcfg/get_domain string eqiad.wmnet
+
+# ip address is taken from DHCP, rest is set here
+d-i netcfg/get_netmask string 255.255.252.0
+d-i netcfg/get_gateway string 10.192.16.1
+d-i netcfg/get_nameservers string 208.80.154.239 91.198.174.6
+d-i netcfg/confirm_static boolean true
+
+d-i mirror/http/proxy string http://webproxy.eqiad.wmnet:8080
+
+# NTP
+d-i clock-setup/ntp-server string ntp.eqiad.wmnet
diff --git
a/modules/install-server/files/autoinstall/subnets/private1-c-codfw.cfg
b/modules/install-server/files/autoinstall/subnets/private1-c-codfw.cfg
new file mode 100644
index 0000000..5fda92e
--- /dev/null
+++ b/modules/install-server/files/autoinstall/subnets/private1-c-codfw.cfg
@@ -0,0 +1,15 @@
+# subnet specific configuration settings
+
+# get_domain should be set, get_hostname is overwritten by DHCP
+d-i netcfg/get_domain string eqiad.wmnet
+
+# ip address is taken from DHCP, rest is set here
+d-i netcfg/get_netmask string 255.255.252.0
+d-i netcfg/get_gateway string 10.192.32.1
+d-i netcfg/get_nameservers string 208.80.154.239 91.198.174.6
+d-i netcfg/confirm_static boolean true
+
+d-i mirror/http/proxy string http://webproxy.eqiad.wmnet:8080
+
+# NTP
+d-i clock-setup/ntp-server string ntp.eqiad.wmnet
diff --git
a/modules/install-server/files/autoinstall/subnets/private1-d-codfw.cfg
b/modules/install-server/files/autoinstall/subnets/private1-d-codfw.cfg
new file mode 100644
index 0000000..9a1b909
--- /dev/null
+++ b/modules/install-server/files/autoinstall/subnets/private1-d-codfw.cfg
@@ -0,0 +1,15 @@
+# subnet specific configuration settings
+
+# get_domain should be set, get_hostname is overwritten by DHCP
+d-i netcfg/get_domain string eqiad.wmnet
+
+# ip address is taken from DHCP, rest is set here
+d-i netcfg/get_netmask string 255.255.252.0
+d-i netcfg/get_gateway string 10.192.64.1
+d-i netcfg/get_nameservers string 208.80.154.239 91.198.174.6
+d-i netcfg/confirm_static boolean true
+
+d-i mirror/http/proxy string http://webproxy.eqiad.wmnet:8080
+
+# NTP
+d-i clock-setup/ntp-server string ntp.eqiad.wmnet
diff --git
a/modules/install-server/files/autoinstall/subnets/public1-a-codfw.cfg
b/modules/install-server/files/autoinstall/subnets/public1-a-codfw.cfg
new file mode 100644
index 0000000..4345713
--- /dev/null
+++ b/modules/install-server/files/autoinstall/subnets/public1-a-codfw.cfg
@@ -0,0 +1,13 @@
+# subnet specific configuration settings
+
+# get_domain should be set, get_hostname is overwritten by DHCP
+d-i netcfg/get_domain string wikimedia.org
+
+# ip address is taken from DHCP, rest is set here
+d-i netcfg/get_netmask string 255.255.255.224
+d-i netcfg/get_gateway string 208.80.153.1
+d-i netcfg/get_nameservers string 208.80.154.239 91.198.174.6
+d-i netcfg/confirm_static boolean true
+
+# NTP
+d-i clock-setup/ntp-server string ntp.eqiad.wmnet
diff --git
a/modules/install-server/files/autoinstall/subnets/public1-b-codfw.cfg
b/modules/install-server/files/autoinstall/subnets/public1-b-codfw.cfg
new file mode 100644
index 0000000..1e37fe8
--- /dev/null
+++ b/modules/install-server/files/autoinstall/subnets/public1-b-codfw.cfg
@@ -0,0 +1,13 @@
+# subnet specific configuration settings
+
+# get_domain should be set, get_hostname is overwritten by DHCP
+d-i netcfg/get_domain string wikimedia.org
+
+# ip address is taken from DHCP, rest is set here
+d-i netcfg/get_netmask string 255.255.255.224
+d-i netcfg/get_gateway string 208.80.153.33
+d-i netcfg/get_nameservers string 208.80.154.239 91.198.174.6
+d-i netcfg/confirm_static boolean true
+
+# NTP
+d-i clock-setup/ntp-server string ntp.eqiad.wmnet
diff --git
a/modules/install-server/files/autoinstall/subnets/public1-c-codfw.cfg
b/modules/install-server/files/autoinstall/subnets/public1-c-codfw.cfg
new file mode 100644
index 0000000..bf1ecf7
--- /dev/null
+++ b/modules/install-server/files/autoinstall/subnets/public1-c-codfw.cfg
@@ -0,0 +1,13 @@
+# subnet specific configuration settings
+
+# get_domain should be set, get_hostname is overwritten by DHCP
+d-i netcfg/get_domain string wikimedia.org
+
+# ip address is taken from DHCP, rest is set here
+d-i netcfg/get_netmask string 255.255.255.224
+d-i netcfg/get_gateway string 208.80.153.65
+d-i netcfg/get_nameservers string 208.80.154.239 91.198.174.6
+d-i netcfg/confirm_static boolean true
+
+# NTP
+d-i clock-setup/ntp-server string ntp.eqiad.wmnet
diff --git
a/modules/install-server/files/autoinstall/subnets/public1-d-codfw.cfg
b/modules/install-server/files/autoinstall/subnets/public1-d-codfw.cfg
new file mode 100644
index 0000000..74aee8f
--- /dev/null
+++ b/modules/install-server/files/autoinstall/subnets/public1-d-codfw.cfg
@@ -0,0 +1,13 @@
+# subnet specific configuration settings
+
+# get_domain should be set, get_hostname is overwritten by DHCP
+d-i netcfg/get_domain string wikimedia.org
+
+# ip address is taken from DHCP, rest is set here
+d-i netcfg/get_netmask string 255.255.255.224
+d-i netcfg/get_gateway string 208.80.153.97
+d-i netcfg/get_nameservers string 208.80.154.239 91.198.174.6
+d-i netcfg/confirm_static boolean true
+
+# NTP
+d-i clock-setup/ntp-server string ntp.eqiad.wmnet
diff --git a/modules/install-server/files/dhcpd/dhcpd.conf
b/modules/install-server/files/dhcpd/dhcpd.conf
index f229da4..e70ad57 100644
--- a/modules/install-server/files/dhcpd/dhcpd.conf
+++ b/modules/install-server/files/dhcpd/dhcpd.conf
@@ -97,6 +97,107 @@
}
#
+# CODFW
+#
+
+# public1-a-codfw
+subnet 208.80.153.0 netmask 255.255.255.224 {
+ authoritative;
+
+ option subnet-mask 255.255.255.224;
+ option broadcast-address 208.80.153.31;
+ option routers 208.80.153.1;
+ option domain-name "wikimedia.org";
+
+ next-server 208.80.154.10; # carbon (tftp server)
+}
+
+# public1-b-codfw
+subnet 208.80.153.32 netmask 255.255.255.224 {
+ authoritative;
+
+ option subnet-mask 255.255.255.224;
+ option broadcast-address 208.80.153.63;
+ option routers 208.80.153.33;
+ option domain-name "wikimedia.org";
+
+ next-server 208.80.153.4; # install2001 (tftp server)
+}
+
+# public1-c-codfw
+subnet 208.80.153.64 netmask 255.255.255.224 {
+ authoritative;
+
+ option subnet-mask 255.255.255.224;
+ option broadcast-address 208.80.153.95;
+ option routers 208.80.153.65;
+ option domain-name "wikimedia.org";
+
+ next-server 208.80.153.4; # install2001 (tftp server)
+}
+
+
+# public1-d-codfw
+subnet 208.80.153.96 netmask 255.255.255.224 {
+ authoritative;
+
+ option subnet-mask 255.255.255.224;
+ option broadcast-address 208.80.153.127;
+ option routers 208.80.153.97;
+ option domain-name "wikimedia.org";
+
+ next-server 208.80.153.4; # install2001 (tftp server)
+}
+
+# private1-a-codfw
+subnet 10.192.0.0 netmask 255.255.252.0 {
+ authoritative;
+
+ option subnet-mask 255.255.252.0;
+ option broadcast-address 10.192.0.255;
+ option routers 10.192.0.1;
+ option domain-name "codfw.wmnet";
+
+ next-server 208.80.153.4; # install2001 (tftp server)
+}
+
+# private1-b-codfw
+subnet 10.192.16.0 netmask 255.255.252.0 {
+ authoritative;
+
+ option subnet-mask 255.255.252.0;
+ option broadcast-address 10.192.19.255;
+ option routers 10.192.16.1;
+ option domain-name "codfw.wmnet";
+
+ next-server 208.80.153.4; # install2001 (tftp server)
+}
+
+# private1-c-codfw
+subnet 10.192.32.0 netmask 255.255.252.0 {
+ authoritative;
+
+ option subnet-mask 255.255.252.0;
+ option broadcast-address 10.192.35.255;
+ option routers 10.192.32.1;
+ option domain-name "codfw.wmnet";
+
+ next-server 208.80.153.4; # install2001 (tftp server)
+}
+
+# private1-d-codfw
+subnet 10.192.48.0 netmask 255.255.252.0 {
+ authoritative;
+
+ option subnet-mask 255.255.252.0;
+ option broadcast-address 10.192.51.255;
+ option routers 10.192.48.1;
+ option domain-name "codfw.wmnet";
+
+ next-server 208.80.153.4; # install2001 (tftp server)
+}
+
+#
# EQIAD
#
@@ -173,7 +274,6 @@
option routers 10.64.0.1;
option domain-name "eqiad.wmnet";
- #next-server 208.80.154.10; # carbon (tftp server)
next-server 208.80.154.10; # carbon (tftp server)
}
@@ -186,7 +286,6 @@
option routers 10.64.16.1;
option domain-name "eqiad.wmnet";
- #next-server 208.80.154.10; # carbon (tftp server)
next-server 208.80.154.10; # carbon (tftp server)
}
@@ -225,7 +324,6 @@
option routers 10.64.4.1;
option domain-name "eqiad.wmnet";
- #next-server 208.80.154.10; # carbon (tftp server)
next-server 208.80.154.10; # carbon (tftp server)
}
@@ -238,7 +336,6 @@
option routers 10.64.20.1;
option domain-name "eqiad.wmnet";
- #next-server 208.80.154.10; # carbon (tftp server)
next-server 208.80.154.10; # carbon (tftp server)
}
@@ -251,7 +348,6 @@
option routers 10.64.37.1;
option domain-name "eqiad.wmnet";
- #next-server 208.80.154.10; # carbon (tftp server)
next-server 208.80.154.10; # carbon (tftp server)
}
@@ -265,7 +361,6 @@
option routers 10.64.5.1;
option domain-name "eqiad.wmnet";
- #next-server 208.80.154.10; # carbon (tftp server)
next-server 208.80.154.10; # carbon (tftp server)
}
@@ -278,7 +373,6 @@
option routers 10.64.21.1;
option domain-name "eqiad.wmnet";
- #next-server 208.80.154.10; # carbon (tftp server)
next-server 208.80.154.10; # carbon (tftp server)
}
@@ -291,7 +385,6 @@
option routers 10.64.36.1;
option domain-name "eqiad.wmnet";
- #next-server 208.80.154.10; # carbon (tftp server)
next-server 208.80.154.10; # carbon (tftp server)
}
@@ -304,7 +397,6 @@
option routers 10.64.53.1;
option domain-name "eqiad.wmnet";
- #next-server 208.80.154.10; # carbon (tftp server)
next-server 208.80.154.10; # carbon (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 8094cbb..e391e85 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -1421,6 +1421,11 @@
fixed-address hydrogen.wikimedia.org;
}
+host install2001 {
+ hardware ethernet D4:AE:52:AA:06:C3;
+ fixed-address install2001.wikimedia.org;
+}
+
host iodine {
hardware ethernet 90:B1:1C:00:A9:D5;
fixed-address iodine.wikimedia.org;
--
To view, visit https://gerrit.wikimedia.org/r/156210
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I27d7455364b1566bcec6e329646b9d966dc8a6db
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: RobH <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
