--- Firewall::Service[toolforge-redis-sentinel-internal].orig
+++ Firewall::Service[toolforge-redis-sentinel-internal]
+ proto => tcp
+ ensure => present
+ desc =>
+ srange => ['tools-redis-5.tools.eqiad1.wikimedia.cloud', 'tools-redis-6.tools.eqiad1.wikimedia.cloud', 'tools-redis-7.tools.eqiad1.wikimedia.cloud']
+ prio => 10
+ unrestricted_access => False
+ port => 26379
+ notrack => False
File[/etc/ferm/conf.d/10_toolforge-redis-prometheus]
- Parameters differences:
--- File[/etc/ferm/conf.d/10_toolforge-redis-prometheus].orig
+++ File[/etc/ferm/conf.d/10_toolforge-redis-prometheus]
- mode => 0400
- require => File[/etc/ferm/conf.d]
- tag => ferm
- ensure => present
- group => root
- notify => Service[ferm]
- owner => root
- Content differences:
--- /etc/ferm/conf.d/10_toolforge-redis-prometheus.orig
+++ /etc/ferm/conf.d/10_toolforge-redis-prometheus
@@ -1,6 +0,0 @@
-# Autogenerated by puppet. DO NOT EDIT BY HAND!
-#
-#
-&R_SERVICE(tcp, 9121, @resolve((tools-prometheus-8.tools.eqiad1.wikimedia.cloud tools-prometheus-9.tools.eqiad1.wikimedia.cloud)));
-
-
- Ferm::Service[toolforge_redis_sentinel_internal]
- Parameters differences:
--- Ferm::Service[toolforge_redis_sentinel_internal].orig
+++ Ferm::Service[toolforge_redis_sentinel_internal]
+ proto => tcp
+ ensure => present
+ desc =>
+ srange => ['tools-redis-5.tools.eqiad1.wikimedia.cloud', 'tools-redis-6.tools.eqiad1.wikimedia.cloud', 'tools-redis-7.tools.eqiad1.wikimedia.cloud']
+ prio => 10
+ unrestricted_access => False
+ port => 26379
+ notrack => False
- File[/etc/ferm/conf.d/10_toolforge_redis_sentinel_internal]
- Parameters differences:
--- File[/etc/ferm/conf.d/10_toolforge_redis_sentinel_internal].orig
+++ File[/etc/ferm/conf.d/10_toolforge_redis_sentinel_internal]
+ mode => 0400
+ require => File[/etc/ferm/conf.d]
+ tag => ferm
+ ensure => present
+ group => root
+ notify => Service[ferm]
+ owner => root
- Content differences:
--- /etc/ferm/conf.d/10_toolforge_redis_sentinel_internal.orig
+++ /etc/ferm/conf.d/10_toolforge_redis_sentinel_internal
@@ -0,0 +1,6 @@
+# Autogenerated by puppet. DO NOT EDIT BY HAND!
+#
+#
+&R_SERVICE(tcp, 26379, (172.16.2.180 172.16.4.186 172.16.5.79));
+
+
- Nftables::Service[toolforge-redis-access]
- Parameters differences:
--- Nftables::Service[toolforge-redis-access].orig
+++ Nftables::Service[toolforge-redis-access]
+ unrestricted_access => False
+ prio => 10
+ proto => tcp
+ ensure => present
+ port => 6379
+ notrack => False
+ desc =>
- File[/etc/ferm/conf.d/10_toolforge-redis-sentinel-internal]
- Parameters differences:
--- File[/etc/ferm/conf.d/10_toolforge-redis-sentinel-internal].orig
+++ File[/etc/ferm/conf.d/10_toolforge-redis-sentinel-internal]
- mode => 0400
- require => File[/etc/ferm/conf.d]
- tag => ferm
- ensure => present
- group => root
- notify => Service[ferm]
- owner => root
- Content differences:
--- /etc/ferm/conf.d/10_toolforge-redis-sentinel-internal.orig
+++ /etc/ferm/conf.d/10_toolforge-redis-sentinel-internal
@@ -1,6 +0,0 @@
-# Autogenerated by puppet. DO NOT EDIT BY HAND!
-#
-#
-&R_SERVICE(tcp, 26379, @resolve((tools-redis-5.tools.eqiad1.wikimedia.cloud tools-redis-6.tools.eqiad1.wikimedia.cloud tools-redis-7.tools.eqiad1.wikimedia.cloud)));
-
-
- Ferm::Service[toolforge-redis-access]
- Parameters differences:
--- Ferm::Service[toolforge-redis-access].orig
+++ Ferm::Service[toolforge-redis-access]
- unrestricted_access => False
- prio => 10
- proto => tcp
- ensure => present
- port => 6379
- notrack => False
- desc =>
- Ferm::Service[toolforge_redis_access]
- Parameters differences:
--- Ferm::Service[toolforge_redis_access].orig
+++ Ferm::Service[toolforge_redis_access]
+ unrestricted_access => False
+ prio => 10
+ proto => tcp
+ ensure => present
+ port => 6379
+ notrack => False
+ desc =>
- Class[Profile::Toolforge::Redis_sentinel]
- Parameters differences:
--- Class[Profile::Toolforge::Redis_sentinel].orig
+++ Class[Profile::Toolforge::Redis_sentinel]
- prometheus_nodes => ['tools-prometheus-8.tools.eqiad1.wikimedia.cloud', 'tools-prometheus-9.tools.eqiad1.wikimedia.cloud']
- Ferm::Service[toolforge-redis-sentinel-internal]
- Parameters differences:
--- Ferm::Service[toolforge-redis-sentinel-internal].orig
+++ Ferm::Service[toolforge-redis-sentinel-internal]
- proto => tcp
- ensure => present
- desc =>
- srange => @resolve((tools-redis-5.tools.eqiad1.wikimedia.cloud tools-redis-6.tools.eqiad1.wikimedia.cloud tools-redis-7.tools.eqiad1.wikimedia.cloud))
- prio => 10
- unrestricted_access => False
- port => 26379
- notrack => False
- Nftables::Service[toolforge-redis-sentinel-internal]
- Parameters differences:
--- Nftables::Service[toolforge-redis-sentinel-internal].orig
+++ Nftables::Service[toolforge-redis-sentinel-internal]
+ proto => tcp
+ ensure => present
+ src_ips => ['172.16.2.180', '172.16.4.186', '172.16.5.79']
+ desc =>
+ unrestricted_access => False
+ prio => 10
+ port => 26379
+ notrack => False
- Firewall::Service[toolforge-redis-access]
- Parameters differences:
--- Firewall::Service[toolforge-redis-access].orig
+++ Firewall::Service[toolforge-redis-access]
+ unrestricted_access => False
+ prio => 10
+ proto => tcp
+ ensure => present
+ port => 6379
+ notrack => False
+ desc =>
- File[/etc/ferm/conf.d/10_toolforge-redis-access]
- Parameters differences:
--- File[/etc/ferm/conf.d/10_toolforge-redis-access].orig
+++ File[/etc/ferm/conf.d/10_toolforge-redis-access]
- mode => 0400
- require => File[/etc/ferm/conf.d]
- tag => ferm
- ensure => present
- group => root
- notify => Service[ferm]
- owner => root
- Content differences:
--- /etc/ferm/conf.d/10_toolforge-redis-access.orig
+++ /etc/ferm/conf.d/10_toolforge-redis-access
@@ -1,6 +0,0 @@
-# Autogenerated by puppet. DO NOT EDIT BY HAND!
-#
-#
-&SERVICE(tcp, 6379);
-
-
Relevant files