[MediaWiki-commits] [Gerrit] operations/puppet[production]: setting labnet100[34] install params

[RobH (Code Review)]

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

Change subject: setting labnet100[34] install params
......................................................................


setting labnet100[34] install params

set dhcpd lease, netboot partitioning, and basic site.pp inclusion for
firewalling

Bug:T165779
Change-Id: I62fbf742bd4e1b10d1c604aa2b4356ed33cb2cc5
---
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, 17 insertions(+), 1 deletion(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 7b67bc7..c0e1157 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1235,6 +1235,12 @@
     include ::standard
 }
 
+node /labnet1001[34]\.eqiad\.wmnet/ {
+    include ::standard
+    include ::base::firewall
+}
+
+
 node 'labnet1002.eqiad.wmnet' {
     role(labs::openstack::nova::api)
     include ::standard
diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index d9291ea..115bbff 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -98,7 +98,7 @@
         labsdb100[67]) echo partman/raid5-gpt-lvm.cfg ;; \
         labsdb[1-3]|labsdb100[1-3]) echo partman/mw.cfg ;; \
         sodium) echo partman/lvm-ext-srv.cfg ;; \
-        labpuppetmaster100[12]|labnodepool1002|labweb100[12]) echo 
partman/raid1-lvm-ext4-srv-noswap.cfg;; \
+        labpuppetmaster100[12]|labnet100[34]|labnodepool1002|labweb100[12]) 
echo partman/raid1-lvm-ext4-srv-noswap.cfg;; \
         labstore200[1-4]) echo partman/labstore-lvm-noraid.cfg ;; \
         labtestneutron2001) echo partman/mw.cfg ;; \
         labtestnet2001) echo partman/raid1.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 d358ca8..5b9abd1 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -2682,6 +2682,16 @@
     filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
 }
 
+host labnet1003 {
+    hardware ethernet 30:e1:71:60:52:40;
+    fixed-address labnet1003.eqiad.wmnet;
+}
+
+host labnet1004 {
+    hardware ethernet 30:e1:71:60:42:20;
+    fixed-address labnet1004.eqiad.wmnet;
+}
+
 host labnodepool1001 {
     hardware ethernet 84:2b:2b:fd:be:fd;
     fixed-address labnodepool1001.eqiad.wmnet;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I62fbf742bd4e1b10d1c604aa2b4356ed33cb2cc5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: RobH <r...@wikimedia.org>
Gerrit-Reviewer: RobH <r...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

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