Muehlenhoff has submitted this change and it was merged.
Change subject: Add ferm rules for redis access on maps cluster
......................................................................
Add ferm rules for redis access on maps cluster
Change-Id: Ib06d23c0ae604bff91ce28090de77e77935f555b
---
M hieradata/role/codfw/maps/server.yaml
M modules/role/manifests/maps/master.pp
2 files changed, 10 insertions(+), 1 deletion(-)
Approvals:
Muehlenhoff: Verified; Looks good to me, approved
Alexandros Kosiaris: Looks good to me, but someone else must approve
diff --git a/hieradata/role/codfw/maps/server.yaml
b/hieradata/role/codfw/maps/server.yaml
index 4df97a8..6f2198d 100644
--- a/hieradata/role/codfw/maps/server.yaml
+++ b/hieradata/role/codfw/maps/server.yaml
@@ -2,3 +2,4 @@
cassandra::dc: codfw
lvs::realserver::realserver_ips:
- 10.2.1.13
+maps::hosts: [ maps-test2001.codfw.wmnet, maps-test2002.codfw.wmnet,
maps-test2003.codfw.wmnet, maps-test2004.codfw.wmnet ]
diff --git a/modules/role/manifests/maps/master.pp
b/modules/role/manifests/maps/master.pp
index 3327bf8..5352a4c 100644
--- a/modules/role/manifests/maps/master.pp
+++ b/modules/role/manifests/maps/master.pp
@@ -42,5 +42,13 @@
mode => '0400',
content => template('role/maps/grants.cql.erb'),
}
-}
+ $maps_hosts = hiera('maps::hosts')
+ $maps_hosts_ferm = join($maps_hosts, ' ')
+
+ ferm::service { 'tilerator_redis':
+ proto => 'tcp',
+ port => '6379',
+ srange => "(${maps_hosts_ferm})",
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/277197
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib06d23c0ae604bff91ce28090de77e77935f555b
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Muehlenhoff <[email protected]>
Gerrit-Reviewer: Yurik <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
