Alexandros Kosiaris has submitted this change and it was merged.

Change subject: Reimage sca[12]00[12] as scb[12]00[34]
......................................................................


Reimage sca[12]00[12] as scb[12]00[34]

Bug: T148830
Change-Id: I2fbdf945d084c7d8866d680e7b77334bed43f7c7
---
M manifests/site.pp
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
3 files changed, 10 insertions(+), 18 deletions(-)

Approvals:
  Alexandros Kosiaris: Verified; Looks good to me, approved



diff --git a/manifests/site.pp b/manifests/site.pp
index ebaf446..743efe4 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2599,7 +2599,7 @@
 }
 
 # Services 'B'
-node /^scb[12]00[12]\.(eqiad|codfw)\.wmnet$/ {
+node /^scb[12]00[1234]\.(eqiad|codfw)\.wmnet$/ {
     role(scb)
 
     interface::add_ip6_mapped { 'main': }
diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index 0294424..6bc57b1 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -136,7 +136,7 @@
         restbase200[7-9]) echo partman/cassandrahosts-4ssd.cfg ;; \
         rhenium) echo partman/raid1-gpt.cfg ;; \
         sarin) echo partman/raid1-lvm-ext4-srv.cfg ;; \
-        analytics1003|sc[ab]200[1-2]|sinistra|cobalt) echo 
partman/raid10-gpt-srv-lvm-ext4.cfg ;; \
+        analytics1003|scb[12]00[1-4]|sinistra|cobalt) echo 
partman/raid10-gpt-srv-lvm-ext4.cfg ;; \
         snapshot1001) echo partman/snapshot.cfg ;; \
         snapshot100[5-7]) echo partman/lvm-ext-srv.cfg ;; \
         stat1002) echo partman/lvm-noraid-large.a.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 a826674..472e0ed 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -5920,32 +5920,24 @@
     fixed-address scandium.eqiad.wmnet;
 }
 
-host sca1001 {
+host scb1003 {
     hardware ethernet F0:1F:AF:E8:B0:EF;
-    fixed-address sca1001.eqiad.wmnet;
-    option pxelinux.pathprefix "trusty-installer/";
-    filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
+    fixed-address scb1003.eqiad.wmnet;
 }
 
-host sca1002 {
+host scb1004 {
     hardware ethernet F0:1F:AF:E8:BF:6F;
-    fixed-address sca1002.eqiad.wmnet;
-    option pxelinux.pathprefix "trusty-installer/";
-    filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
+    fixed-address scb1004.eqiad.wmnet;
 }
 
-host sca2001 {
+host scb2003 {
     hardware ethernet 14:18:77:33:4F:F5;
-    fixed-address sca2001.codfw.wmnet;
-    option pxelinux.pathprefix "trusty-installer/";
-    filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
+    fixed-address scb2003.codfw.wmnet;
 }
 
-host sca2002 {
+host scb2004 {
     hardware ethernet 14:18:77:33:3D:B3;
-    fixed-address sca2002.codfw.wmnet;
-    option pxelinux.pathprefix "trusty-installer/";
-    filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
+    fixed-address scb2004.codfw.wmnet;
 }
 
 host scb1001 {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2fbdf945d084c7d8866d680e7b77334bed43f7c7
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@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