[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add new m1 host db2078, enable firewall on all misc services

[Jcrespo (Code Review)]

Jcrespo has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377460 )

Change subject: Add new m1 host db2078, enable firewall on all misc services
......................................................................

Add new m1 host db2078, enable firewall on all misc services

Bug: T175685
Bug: T104699
Change-Id: Ieb074118dd7e23ff5a154ba176e439a047b98b84
---
M manifests/site.pp
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
M modules/role/manifests/mariadb/misc.pp
3 files changed, 9 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/60/377460/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 0eaddad..6fd298a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -553,21 +553,24 @@
         shard  => 'm1',
         master => true,
     }
-    include ::base::firewall
 }
 
 node 'db1001.eqiad.wmnet' {
     class { '::role::mariadb::misc':
         shard  => 'm1',
     }
-    include ::base::firewall
 }
 
 node 'db2010.codfw.wmnet' {
     class { '::role::mariadb::misc':
         shard => 'm1',
     }
-    include ::base::firewall
+}
+
+node 'db2078.codfw.wmnet' {
+    class { '::role::mariadb::misc':
+        shard => 'm1',
+    }
 }
 
 ## m2 shard
@@ -613,7 +616,6 @@
         shard  => 'm4',
         master => true,
     }
-    include ::base::firewall
 }
 node 'db1047.eqiad.wmnet' {
     # this slave has an m4 custom replication protocol
@@ -623,7 +625,6 @@
         shard  => 'm4',
         master => false,
     }
-    include ::base::firewall
 }
 
 # m5 shard
@@ -638,7 +639,6 @@
     class { '::role::mariadb::misc':
         shard => 'm5',
     }
-    include ::base::firewall
 }
 
 # sanitarium
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 4c673bd..d5a2fcc 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -1647,6 +1647,8 @@
 host db2078 {
     hardware ethernet 18:66:DA:F8:EE:A0;
     fixed-address db2078.codfw.wmnet;
+    option pxelinux.pathprefix "stretch-installer/";
+    filename "stretch-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host db2079 {
diff --git a/modules/role/manifests/mariadb/misc.pp 
b/modules/role/manifests/mariadb/misc.pp
index d424575..8de997c 100644
--- a/modules/role/manifests/mariadb/misc.pp
+++ b/modules/role/manifests/mariadb/misc.pp
@@ -21,6 +21,7 @@
     include ::standard
     include role::mariadb::monitor
     include passwords::misc::scripts
+    include ::base::firewall
     include role::mariadb::ferm
     class { 'role::mariadb::groups':
         mysql_group => 'misc',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieb074118dd7e23ff5a154ba176e439a047b98b84
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo <jcre...@wikimedia.org>

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