--- Firewall::Service[mysql_adm_alternate_s2].orig
+++ Firewall::Service[mysql_adm_alternate_s2]
+ proto => tcp
+ prio => 10
+ desc =>
+ ensure => present
+ port => 3332
+ unrestricted_access => False
+ notrack => False
+ srange => ['10.64.16.90', '10.192.16.191', '10.64.16.154', '10.192.32.49', '208.80.154.9', '10.64.0.20']
File[/etc/ferm/conf.d/10_mysql_admin_s7]
- Content differences:
--- /etc/ferm/conf.d/10_mysql_admin_s7.orig
+++ /etc/ferm/conf.d/10_mysql_admin_s7
@@ -1,6 +1,6 @@
# Autogenerated by puppet. DO NOT EDIT BY HAND!
#
#
-&R_SERVICE(tcp, 3317, (10.64.16.90 10.192.16.191 10.64.16.154 10.192.32.49 208.80.154.9 10.64.0.20));
+&R_SERVICE(tcp, 3317, (10.192.16.191 10.192.32.49 10.64.0.20 10.64.16.154 10.64.16.90 208.80.154.9));
File[/etc/ferm/conf.d/10_mysql_adm_alternate_s7]
- Content differences:
--- /etc/ferm/conf.d/10_mysql_adm_alternate_s7.orig
+++ /etc/ferm/conf.d/10_mysql_adm_alternate_s7
@@ -1,6 +1,6 @@
# Autogenerated by puppet. DO NOT EDIT BY HAND!
#
#
-&R_SERVICE(tcp, 3337, (10.64.16.90 10.192.16.191 10.64.16.154 10.192.32.49 208.80.154.9 10.64.0.20));
+&R_SERVICE(tcp, 3337, (10.192.16.191 10.192.32.49 10.64.0.20 10.64.16.154 10.64.16.90 208.80.154.9));
Ferm::Service[mysql_adm_alternate_s2]
- Parameters differences:
--- Ferm::Service[mysql_adm_alternate_s2].orig
+++ Ferm::Service[mysql_adm_alternate_s2]
@@
- srange => (10.64.16.90 10.192.16.191 10.64.16.154 10.192.32.49 208.80.154.9 10.64.0.20)
+ srange => ['10.64.16.90', '10.192.16.191', '10.64.16.154', '10.192.32.49', '208.80.154.9', '10.64.0.20']
- Ferm::Service[mysql_admin_s7]
- Parameters differences:
--- Ferm::Service[mysql_admin_s7].orig
+++ Ferm::Service[mysql_admin_s7]
@@
- srange => (10.64.16.90 10.192.16.191 10.64.16.154 10.192.32.49 208.80.154.9 10.64.0.20)
+ srange => ['10.64.16.90', '10.192.16.191', '10.64.16.154', '10.192.32.49', '208.80.154.9', '10.64.0.20']
- File[/etc/ferm/conf.d/10_mysql_admin_s2]
- Content differences:
--- /etc/ferm/conf.d/10_mysql_admin_s2.orig
+++ /etc/ferm/conf.d/10_mysql_admin_s2
@@ -1,6 +1,6 @@
# Autogenerated by puppet. DO NOT EDIT BY HAND!
#
#
-&R_SERVICE(tcp, 3312, (10.64.16.90 10.192.16.191 10.64.16.154 10.192.32.49 208.80.154.9 10.64.0.20));
+&R_SERVICE(tcp, 3312, (10.192.16.191 10.192.32.49 10.64.0.20 10.64.16.154 10.64.16.90 208.80.154.9));
- Ferm::Service[mysql_wmcs_db_admin_s2]
- Parameters differences:
--- Ferm::Service[mysql_wmcs_db_admin_s2].orig
+++ Ferm::Service[mysql_wmcs_db_admin_s2]
@@
- srange => (@resolve((cloudcontrol1006.eqiad.wmnet cloudcontrol1007.eqiad.wmnet cloudcontrol1011.eqiad.wmnet)))
+ srange => ['cloudcontrol1006.eqiad.wmnet', 'cloudcontrol1007.eqiad.wmnet', 'cloudcontrol1011.eqiad.wmnet']
- Ferm::Service[mysql_admin_s2]
- Parameters differences:
--- Ferm::Service[mysql_admin_s2].orig
+++ Ferm::Service[mysql_admin_s2]
@@
- srange => (10.64.16.90 10.192.16.191 10.64.16.154 10.192.32.49 208.80.154.9 10.64.0.20)
+ srange => ['10.64.16.90', '10.192.16.191', '10.64.16.154', '10.192.32.49', '208.80.154.9', '10.64.0.20']
- File[/etc/ferm/conf.d/10_mysql_wmcs_db_admin_s7]
- Content differences:
--- /etc/ferm/conf.d/10_mysql_wmcs_db_admin_s7.orig
+++ /etc/ferm/conf.d/10_mysql_wmcs_db_admin_s7
@@ -1,7 +1,7 @@
# Autogenerated by puppet. DO NOT EDIT BY HAND!
#
#
-&R_SERVICE(tcp, 3317, (@resolve((cloudcontrol1006.eqiad.wmnet cloudcontrol1007.eqiad.wmnet cloudcontrol1011.eqiad.wmnet))));
+&R_SERVICE(tcp, 3317, (10.64.148.21 10.64.150.6 10.64.151.8 2620:0:861:11c:10:64:148:21 2620:0:861:11e:10:64:150:6 2620:0:861:11f:10:64:151:8));
- Firewall::Service[mysql_wikireplica_db_cloudlb_proxy_s2]
- Parameters differences:
--- Firewall::Service[mysql_wikireplica_db_cloudlb_proxy_s2].orig
+++ Firewall::Service[mysql_wikireplica_db_cloudlb_proxy_s2]
+ proto => tcp
+ prio => 10
+ desc =>
+ ensure => present
+ port => 3312
+ notrack => True
+ unrestricted_access => False
+ srange => ['cloudlb1001.eqiad.wmnet', 'cloudlb1002.eqiad.wmnet']
- Firewall::Service[mysql_adm_alternate_s7]
- Parameters differences:
--- Firewall::Service[mysql_adm_alternate_s7].orig
+++ Firewall::Service[mysql_adm_alternate_s7]
+ proto => tcp
+ prio => 10
+ desc =>
+ ensure => present
+ port => 3337
+ unrestricted_access => False
+ notrack => False
+ srange => ['10.64.16.90', '10.192.16.191', '10.64.16.154', '10.192.32.49', '208.80.154.9', '10.64.0.20']
- Firewall::Service[mysql_wmcs_db_admin_s7]
- Parameters differences:
--- Firewall::Service[mysql_wmcs_db_admin_s7].orig
+++ Firewall::Service[mysql_wmcs_db_admin_s7]
+ proto => tcp
+ prio => 10
+ desc =>
+ ensure => present
+ port => 3317
+ notrack => True
+ unrestricted_access => False
+ srange => ['cloudcontrol1006.eqiad.wmnet', 'cloudcontrol1007.eqiad.wmnet', 'cloudcontrol1011.eqiad.wmnet']
- File[/etc/ferm/conf.d/10_mysql_adm_alternate_s2]
- Content differences:
--- /etc/ferm/conf.d/10_mysql_adm_alternate_s2.orig
+++ /etc/ferm/conf.d/10_mysql_adm_alternate_s2
@@ -1,6 +1,6 @@
# Autogenerated by puppet. DO NOT EDIT BY HAND!
#
#
-&R_SERVICE(tcp, 3332, (10.64.16.90 10.192.16.191 10.64.16.154 10.192.32.49 208.80.154.9 10.64.0.20));
+&R_SERVICE(tcp, 3332, (10.192.16.191 10.192.32.49 10.64.0.20 10.64.16.154 10.64.16.90 208.80.154.9));
- Ferm::Service[mysql_adm_alternate_s7]
- Parameters differences:
--- Ferm::Service[mysql_adm_alternate_s7].orig
+++ Ferm::Service[mysql_adm_alternate_s7]
@@
- srange => (10.64.16.90 10.192.16.191 10.64.16.154 10.192.32.49 208.80.154.9 10.64.0.20)
+ srange => ['10.64.16.90', '10.192.16.191', '10.64.16.154', '10.192.32.49', '208.80.154.9', '10.64.0.20']
- Firewall::Service[mysql_wikireplica_db_cloudlb_proxy_s7]
- Parameters differences:
--- Firewall::Service[mysql_wikireplica_db_cloudlb_proxy_s7].orig
+++ Firewall::Service[mysql_wikireplica_db_cloudlb_proxy_s7]
+ proto => tcp
+ prio => 10
+ desc =>
+ ensure => present
+ port => 3317
+ notrack => True
+ unrestricted_access => False
+ srange => ['cloudlb1001.eqiad.wmnet', 'cloudlb1002.eqiad.wmnet']
- File[/etc/ferm/conf.d/10_mysql_wmcs_db_admin_s2]
- Content differences:
--- /etc/ferm/conf.d/10_mysql_wmcs_db_admin_s2.orig
+++ /etc/ferm/conf.d/10_mysql_wmcs_db_admin_s2
@@ -1,7 +1,7 @@
# Autogenerated by puppet. DO NOT EDIT BY HAND!
#
#
-&R_SERVICE(tcp, 3312, (@resolve((cloudcontrol1006.eqiad.wmnet cloudcontrol1007.eqiad.wmnet cloudcontrol1011.eqiad.wmnet))));
+&R_SERVICE(tcp, 3312, (10.64.148.21 10.64.150.6 10.64.151.8 2620:0:861:11c:10:64:148:21 2620:0:861:11e:10:64:150:6 2620:0:861:11f:10:64:151:8));
- Firewall::Service[mysql_admin_s2]
- Parameters differences:
--- Firewall::Service[mysql_admin_s2].orig
+++ Firewall::Service[mysql_admin_s2]
+ proto => tcp
+ prio => 10
+ desc =>
+ ensure => present
+ port => 3312
+ unrestricted_access => False
+ notrack => False
+ srange => ['10.64.16.90', '10.192.16.191', '10.64.16.154', '10.192.32.49', '208.80.154.9', '10.64.0.20']
- Ferm::Service[mysql_wmcs_db_admin_s7]
- Parameters differences:
--- Ferm::Service[mysql_wmcs_db_admin_s7].orig
+++ Ferm::Service[mysql_wmcs_db_admin_s7]
@@
- srange => (@resolve((cloudcontrol1006.eqiad.wmnet cloudcontrol1007.eqiad.wmnet cloudcontrol1011.eqiad.wmnet)))
+ srange => ['cloudcontrol1006.eqiad.wmnet', 'cloudcontrol1007.eqiad.wmnet', 'cloudcontrol1011.eqiad.wmnet']
- Firewall::Service[mysql_admin_s7]
- Parameters differences:
--- Firewall::Service[mysql_admin_s7].orig
+++ Firewall::Service[mysql_admin_s7]
+ proto => tcp
+ prio => 10
+ desc =>
+ ensure => present
+ port => 3317
+ unrestricted_access => False
+ notrack => False
+ srange => ['10.64.16.90', '10.192.16.191', '10.64.16.154', '10.192.32.49', '208.80.154.9', '10.64.0.20']
- Firewall::Service[mysql_wmcs_db_admin_s2]
- Parameters differences:
--- Firewall::Service[mysql_wmcs_db_admin_s2].orig
+++ Firewall::Service[mysql_wmcs_db_admin_s2]
+ proto => tcp
+ prio => 10
+ desc =>
+ ensure => present
+ port => 3312
+ notrack => True
+ unrestricted_access => False
+ srange => ['cloudcontrol1006.eqiad.wmnet', 'cloudcontrol1007.eqiad.wmnet', 'cloudcontrol1011.eqiad.wmnet']