Jcrespo has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/370788 )

Change subject: install_server: Allow reimage of db1069, dbstore2001
......................................................................


install_server: Allow reimage of db1069, dbstore2001

db1069 as jessie (already setup like that), dbstore2001 with
stretch (changed).

Updated db2062 and dbstore2002 + new labs hosts, which were
already using stretch.

Bug: T166546
Bug: T168409
Change-Id: Idfec276da1c715b170b051833545cf4b911e66f0
---
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
2 files changed, 18 insertions(+), 2 deletions(-)

Approvals:
  jenkins-bot: Verified
  Jcrespo: Looks good to me, approved



diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index 5b3187b..1081837 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -65,8 +65,8 @@
         conf200[123]) echo partman/raid1-lvm-ext4-srv.cfg ;; \
         cp1008|cp300[3-9]|cp3010) echo partman/varnish-oldssd.cfg ;; \
         cp[12345][0-9][0-9][0-9]) echo partman/varnish.cfg ;; \
-        db109[6-9]|db110[0-6]) echo partman/db.cfg ;; \
-        db207[1-9]|db208[0-9]|db209[0-2]) echo partman/db.cfg ;; \
+        db109[6-9]|db110[0-6]|db1069) echo partman/db.cfg ;; \
+        db207[1-9]|db208[0-9]|db209[0-2]|dbstore2001) echo partman/db.cfg ;; \
         
db[0-8][0-9]|db10[0-8][0-9]|db109[0-5]|db20[0-2][0-9]|db2030|db203[3-9]|db20[4-7][0-9]|dbstore[1-2]00[1-9]|es[1-2]01[1-9])
 echo partman/db-no-srv-format.cfg ;; \
         d-i-test) echo partman/flat.cfg virtual.cfg ;; \
         druid100[1-6]) echo partman/druid-4ssd-raid10.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 730eca4..6818d06 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -1302,6 +1302,8 @@
 host db1095 {
     hardware ethernet 14:02:EC:3D:5D:CC;
     fixed-address db1095.eqiad.wmnet;
+    option pxelinux.pathprefix "stretch-installer/";
+    filename "stretch-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host db1096 {
@@ -1339,6 +1341,8 @@
 host db1102 {
     hardware ethernet 18:66:DA:F8:D5:D0;
     fixed-address db1102.eqiad.wmnet;
+    option pxelinux.pathprefix "stretch-installer/";
+    filename "stretch-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host db1103 {
@@ -1593,6 +1597,8 @@
 host db2062 {
     hardware ethernet 40:a8:f0:35:3b:a0;
     fixed-address db2062.codfw.wmnet;
+    option pxelinux.pathprefix "stretch-installer/";
+    filename "stretch-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host db2063 {
@@ -1817,11 +1823,15 @@
 host dbstore2001 {
     hardware ethernet 40:a8:f0:26:b9:84;
     fixed-address dbstore2001.codfw.wmnet;
+    option pxelinux.pathprefix "stretch-installer/";
+    filename "stretch-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host dbstore2002 {
     hardware ethernet 40:a8:f0:26:8a:14;
     fixed-address dbstore2002.codfw.wmnet;
+    option pxelinux.pathprefix "stretch-installer/";
+    filename "stretch-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host cp1099 {
@@ -2802,16 +2812,22 @@
 host labsdb1009 {
     hardware ethernet 1c:98:ec:1a:6b:68;
     fixed-address labsdb1009.eqiad.wmnet;
+    option pxelinux.pathprefix "stretch-installer/";
+    filename "stretch-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host labsdb1010 {
     hardware ethernet 1c:98:ec:1a:6b:80;
     fixed-address labsdb1010.eqiad.wmnet;
+    option pxelinux.pathprefix "stretch-installer/";
+    filename "stretch-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host labsdb1011 {
     hardware ethernet 1c:98:ec:1a:6b:04;
     fixed-address labsdb1011.eqiad.wmnet;
+    option pxelinux.pathprefix "stretch-installer/";
+    filename "stretch-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host labservices1001 {

-- 
To view, visit https://gerrit.wikimedia.org/r/370788
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Idfec276da1c715b170b051833545cf4b911e66f0
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo <jcre...@wikimedia.org>
Gerrit-Reviewer: Jcrespo <jcre...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to