Alexandros Kosiaris has submitted this change and it was merged.

Change subject: role::mariadb: Remove neon ferm rules
......................................................................


role::mariadb: Remove neon ferm rules

Monitoring hosts bypass all ferm rules anyway, no need to specify them
explicitly

Change-Id: Iea54d56e7a6dd092fd0f2569b87eba0114bdb87e
---
M manifests/role/mariadb.pp
1 file changed, 1 insertion(+), 12 deletions(-)

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



diff --git a/manifests/role/mariadb.pp b/manifests/role/mariadb.pp
index 2594e5d..5aece41 100644
--- a/manifests/role/mariadb.pp
+++ b/manifests/role/mariadb.pp
@@ -117,14 +117,9 @@
         srange  => '$INTERNAL',
     }
 
-    # tendril monitoring
-    ferm::rule { 'mariadb_monitoring':
-        rule => 'saddr @resolve((neon.wikimedia.org)) proto tcp dport (3306) 
ACCEPT;',
-    }
-
     # for DBA purposes
     ferm::rule { 'mariadb_dba':
-        rule => 'saddr @resolve((neon.wikimedia.org db1011.eqiad.wmnet)) proto 
tcp dport (3307) ACCEPT;',
+        rule => 'saddr @resolve((db1011.eqiad.wmnet)) proto tcp dport (3307) 
ACCEPT;',
     }
 }
 
@@ -468,12 +463,6 @@
     class {'role::mariadb::groups':
         mysql_group => 'tendril',
         mysql_role  => 'standalone',
-    }
-
-    ferm::service { 'memcached_tendril':
-        proto  => 'tcp',
-        port   => '11211',
-        srange => '@resolve(neon.wikimedia.org)',
     }
 
     class { 'mariadb::config':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iea54d56e7a6dd092fd0f2569b87eba0114bdb87e
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: Jcrespo <jcre...@wikimedia.org>
Gerrit-Reviewer: Marostegui <maroste...@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