Faidon Liambotis has submitted this change and it was merged.
Change subject: DHCP configurations for eqiad Row D
......................................................................
DHCP configurations for eqiad Row D
Adding the dhcpd.conf needed stanzas
Adding autoinstall subnets (private1-d-eqiad was already there)
Adding autoinstall public subnet for row C that was missing
Updating preseed.cfg as well
Change-Id: I3bae7614fbdd938e341ba6ab4822e7e47dd5562b
---
M modules/install-server/files/autoinstall/netboot.cfg
A modules/install-server/files/autoinstall/subnets/public1-c-eqiad.cfg
A modules/install-server/files/autoinstall/subnets/public1-d-eqiad.cfg
M modules/install-server/files/dhcpd/dhcpd.conf
4 files changed, 51 insertions(+), 0 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/install-server/files/autoinstall/netboot.cfg
b/modules/install-server/files/autoinstall/netboot.cfg
index 5ff1bb5..4ff407a 100755
--- a/modules/install-server/files/autoinstall/netboot.cfg
+++ b/modules/install-server/files/autoinstall/netboot.cfg
@@ -18,6 +18,8 @@
10.4.16.255) echo subnets/pmtpa-virt.cfg ;; \
208.80.154.63) echo subnets/public1-a-eqiad.cfg ;; \
208.80.154.191) echo subnets/public1-b-eqiad.cfg ;; \
+ 208.80.154.127) echo subnets/public1-c-eqiad.cfg ;; \
+ 208.80.155.127) echo subnets/public1-d-eqiad.cfg ;; \
208.80.155.79) echo subnets/sandbox1-b-eqiad.cfg ;; \
10.64.3.255) echo subnets/private1-a-eqiad.cfg ;; \
10.64.19.255) echo subnets/private1-b-eqiad.cfg ;; \
diff --git
a/modules/install-server/files/autoinstall/subnets/public1-c-eqiad.cfg
b/modules/install-server/files/autoinstall/subnets/public1-c-eqiad.cfg
new file mode 100644
index 0000000..7087b72
--- /dev/null
+++ b/modules/install-server/files/autoinstall/subnets/public1-c-eqiad.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.192
+d-i netcfg/get_gateway string 208.80.154.65
+d-i netcfg/get_nameservers string 208.80.154.239 208.80.152.131
+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-eqiad.cfg
b/modules/install-server/files/autoinstall/subnets/public1-d-eqiad.cfg
new file mode 100644
index 0000000..90f8eca
--- /dev/null
+++ b/modules/install-server/files/autoinstall/subnets/public1-d-eqiad.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.155.97
+d-i netcfg/get_nameservers string 208.80.154.239 208.80.152.131
+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 9c956e2..51549d1 100644
--- a/modules/install-server/files/dhcpd/dhcpd.conf
+++ b/modules/install-server/files/dhcpd/dhcpd.conf
@@ -136,6 +136,18 @@
next-server 208.80.154.10; # carbon (tftp server)
}
+# public1-d-eqiad
+subnet 208.80.155.96 netmask 255.255.255.224 {
+ authoritative;
+
+ option subnet-mask 255.255.255.224;
+ option broadcast-address 208.80.155.127;
+ option routers 208.80.155.97;
+ option domain-name "wikimedia.org";
+
+ next-server 208.80.154.10; # carbon (tftp server)
+}
+
# sandbox1-b-eqiad
subnet 208.80.155.64 netmask 255.255.255.240 {
authoritative;
@@ -184,6 +196,17 @@
next-server 208.80.154.10; # carbon (tftp server)
}
+# private1-d-eqiad
+subnet 10.64.48.0 netmask 255.255.252.0 {
+ authoritative;
+
+ option subnet-mask 255.255.252.0;
+ option broadcast-address 10.64.51.255;
+ option routers 10.64.48.1;
+ option domain-name "eqiad.wmnet";
+
+ next-server 208.80.154.10; # carbon (tftp server)
+}
# labs-hosts1-b-eqiad subnet
subnet 10.64.20.0 netmask 255.255.255.0 {
--
To view, visit https://gerrit.wikimedia.org/r/115154
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3bae7614fbdd938e341ba6ab4822e7e47dd5562b
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
