[MediaWiki-commits] [Gerrit] Introduce scb100{1, 2}.eqiad.wmnet - change (operations/puppet)

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: Introduce scb100{1,2}.eqiad.wmnet
......................................................................


Introduce scb100{1,2}.eqiad.wmnet

Have scb1001, scb1002 install as jessie and an exact copy of sca1001,
sca1002

Bug: T107287
Change-Id: I599daa51b2b2e4078786dcf5a3d9e758973ff277
---
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, 16 insertions(+), 2 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 5f907c5..582e4b6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2170,7 +2170,7 @@
     include standard
 }
 
-node /^sca100[12]\.eqiad\.wmnet$/ {
+node /^sc[ab]100[12]\.eqiad\.wmnet$/ {
     role sca
 }
 
diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index 7e7be34..0c69942 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -69,7 +69,7 @@
                elastic10[0-2][0-9]|elastic103[0-1]) echo 
partman/elasticsearch.cfg ;; \
                etcd100[1-9]) echo partman/lvm-etcd.cfg virtual.cfg;; \
                bromine|etherpad[12]001|fermium|krypton|planet1001) echo 
partman/flat.cfg virtual.cfg ;; \
-               eventlog[1-2]001|labcontrol2001|ocg100[1-3]|sca100[1-2]) echo 
partman/raid1.cfg ;; \
+               eventlog[1-2]001|labcontrol2001|ocg100[1-3]|sc[ab]100[1-2]) 
echo partman/raid1.cfg ;; \
                francium) echo partman/raid10-gpt.cfg ;; \
                ganeti100[1-9]) echo partman/ganeti-raid1.cfg ;; \
                ganeti200[1-9]) echo partman/ganeti.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 e2d6b4c..c8e5e3b 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -5806,6 +5806,20 @@
        fixed-address sca1002.eqiad.wmnet;
 }
 
+host scb1001 {
+       hardware ethernet 90:b1:1c:2d:87:0c;
+       fixed-address scb1001.eqiad.wmnet;
+       option pxelinux.pathprefix "jessie-installer/";
+       filename "jessie-installer/debian-installer/amd64/pxelinux.0";
+}
+
+host scb1002 {
+       hardware ethernet 90:b1:1c:2d:7f:6b;
+       fixed-address scb1002.eqiad.wmnet;
+       option pxelinux.pathprefix "jessie-installer/";
+       filename "jessie-installer/debian-installer/amd64/pxelinux.0";
+}
+
 host silver {
        hardware ethernet 18:03:73:f1:58:67;
        fixed-address silver.wikimedia.org;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I599daa51b2b2e4078786dcf5a3d9e758973ff277
Gerrit-PatchSet: 2
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