--- Class[Profile::Dns::Auth::Update].orig
+++ Class[Profile::Dns::Auth::Update]
@@
- advertise_vips => {'recdns.anycast.wmnet': {'address': '10.3.0.1', 'check_cmd': '/usr/local/bin/check_recdns_state /usr/lib/nagios/plugins/check_dns_query -H 10.3.0.1 -l -d www.wikipedia.org -t 1', 'ensure': 'present', 'service_type': 'recdns'}, 'ns2.wikimedia.org': {'address': '198.35.27.27', 'check_cmd': '/usr/local/bin/check_authdns_ns2_state /usr/lib/nagios/plugins/check_dns_query -H 198.35.27.27 -a -l -d www.wikipedia.org -t 1', 'ensure': 'present', 'service_type': 'authdns-ns2'}, 'ns0.wikimedia.org': {'address': '208.80.154.238', 'check_cmd': '/usr/local/bin/check_authdns_ns0_state /usr/lib/nagios/plugins/check_dns_query -H 208.80.154.238 -a -l -d www.wikipedia.org -t 1', 'ensure': 'present', 'service_type': 'authdns-ns0'}, 'ntp-a.anycast.wmnet': {'address': '10.3.0.5', 'check_cmd': '/usr/local/bin/check_ntp_a_state /usr/lib/nagios/plugins/check_ntp_peer -H 127.0.0.1 -w 0.05 -c 0.1', 'ensure': 'present', 'service_type': 'ntp-a'}}
+ advertise_vips => {'recdns.anycast.wmnet': {'address': '10.3.0.1', 'check_cmd': '/usr/local/bin/check_recdns_state /usr/lib/nagios/plugins/check_dns_query -H 10.3.0.1 -l -d www.wikipedia.org -t 1', 'ensure': 'present', 'service_type': 'recdns'}, 'ns2.wikimedia.org': {'address': '198.35.27.27', 'check_cmd': '/usr/local/bin/check_authdns_ns2_state /usr/lib/nagios/plugins/check_dns_query -H 198.35.27.27 -a -l -d www.wikipedia.org -t 1', 'address_ipv6': '2a02:ec80:53::1', 'check_cmd_ipv6': '/usr/local/bin/check_authdns_ns2_state /usr/lib/nagios/plugins/check_dns_query -H 2a02:ec80:53::1 -a -l -d www.wikipedia.org -t 1', 'ensure': 'present', 'service_type': 'authdns-ns2'}, 'ns0.wikimedia.org': {'address': '208.80.154.238', 'check_cmd': '/usr/local/bin/check_authdns_ns0_state /usr/lib/nagios/plugins/check_dns_query -H 208.80.154.238 -a -l -d www.wikipedia.org -t 1', 'address_ipv6': '2620:0:861:53::1', 'check_cmd_ipv6': '/usr/local/bin/check_authdns_ns0_state /usr/lib/nagios/plugins/check_dns_query -H 2620:0:861:53::1 -a -l -d www.wikipedia.org -t 1', 'ensure': 'present', 'service_type': 'authdns-ns0'}, 'ntp-a.anycast.wmnet': {'address': '10.3.0.5', 'check_cmd': '/usr/local/bin/check_ntp_a_state /usr/lib/nagios/plugins/check_ntp_peer -H 127.0.0.1 -w 0.05 -c 0.1', 'ensure': 'present', 'service_type': 'ntp-a'}}
Class[Profile::Dns::Recursor]
- Parameters differences:
--- Class[Profile::Dns::Recursor].orig
+++ Class[Profile::Dns::Recursor]
@@
- advertise_vips => {'recdns.anycast.wmnet': {'address': '10.3.0.1', 'check_cmd': '/usr/local/bin/check_recdns_state /usr/lib/nagios/plugins/check_dns_query -H 10.3.0.1 -l -d www.wikipedia.org -t 1', 'ensure': 'present', 'service_type': 'recdns'}, 'ns2.wikimedia.org': {'address': '198.35.27.27', 'check_cmd': '/usr/local/bin/check_authdns_ns2_state /usr/lib/nagios/plugins/check_dns_query -H 198.35.27.27 -a -l -d www.wikipedia.org -t 1', 'ensure': 'present', 'service_type': 'authdns-ns2'}, 'ns0.wikimedia.org': {'address': '208.80.154.238', 'check_cmd': '/usr/local/bin/check_authdns_ns0_state /usr/lib/nagios/plugins/check_dns_query -H 208.80.154.238 -a -l -d www.wikipedia.org -t 1', 'ensure': 'present', 'service_type': 'authdns-ns0'}, 'ntp-a.anycast.wmnet': {'address': '10.3.0.5', 'check_cmd': '/usr/local/bin/check_ntp_a_state /usr/lib/nagios/plugins/check_ntp_peer -H 127.0.0.1 -w 0.05 -c 0.1', 'ensure': 'present', 'service_type': 'ntp-a'}}
+ advertise_vips => {'recdns.anycast.wmnet': {'address': '10.3.0.1', 'check_cmd': '/usr/local/bin/check_recdns_state /usr/lib/nagios/plugins/check_dns_query -H 10.3.0.1 -l -d www.wikipedia.org -t 1', 'ensure': 'present', 'service_type': 'recdns'}, 'ns2.wikimedia.org': {'address': '198.35.27.27', 'check_cmd': '/usr/local/bin/check_authdns_ns2_state /usr/lib/nagios/plugins/check_dns_query -H 198.35.27.27 -a -l -d www.wikipedia.org -t 1', 'address_ipv6': '2a02:ec80:53::1', 'check_cmd_ipv6': '/usr/local/bin/check_authdns_ns2_state /usr/lib/nagios/plugins/check_dns_query -H 2a02:ec80:53::1 -a -l -d www.wikipedia.org -t 1', 'ensure': 'present', 'service_type': 'authdns-ns2'}, 'ns0.wikimedia.org': {'address': '208.80.154.238', 'check_cmd': '/usr/local/bin/check_authdns_ns0_state /usr/lib/nagios/plugins/check_dns_query -H 208.80.154.238 -a -l -d www.wikipedia.org -t 1', 'address_ipv6': '2620:0:861:53::1', 'check_cmd_ipv6': '/usr/local/bin/check_authdns_ns0_state /usr/lib/nagios/plugins/check_dns_query -H 2620:0:861:53::1 -a -l -d www.wikipedia.org -t 1', 'ensure': 'present', 'service_type': 'authdns-ns0'}, 'ntp-a.anycast.wmnet': {'address': '10.3.0.5', 'check_cmd': '/usr/local/bin/check_ntp_a_state /usr/lib/nagios/plugins/check_ntp_peer -H 127.0.0.1 -w 0.05 -c 0.1', 'ensure': 'present', 'service_type': 'ntp-a'}}
- Bird::Anycast_healthchecker_check[hc-vip-ntp-a.anycast.wmnet]
- Parameters differences:
--- Bird::Anycast_healthchecker_check[hc-vip-ntp-a.anycast.wmnet].orig
+++ Bird::Anycast_healthchecker_check[hc-vip-ntp-a.anycast.wmnet]
@@
- do_ipv6 => False
+ do_ipv6 => True
- File[/etc/anycast-healthchecker.conf]
- Content differences:
--- /etc/anycast-healthchecker.conf.orig
+++ /etc/anycast-healthchecker.conf
@@ -4,7 +4,7 @@
[daemon]
pidfile = /var/run/anycast-healthchecker/anycast-healthchecker.pid
ipv4 = true
-ipv6 = false
+ipv6 = true
bird_conf = /etc/bird/anycast-prefixes.conf
bird6_conf = /etc/bird/anycast6-prefixes.conf
bird_variable = ACAST_PS_ADVERTISE
- Class[Bird::Anycast_healthchecker]
- Parameters differences:
--- Class[Bird::Anycast_healthchecker].orig
+++ Class[Bird::Anycast_healthchecker]
@@
- do_ipv6 => False
+ do_ipv6 => True
- Bird::Anycast_healthchecker_check[hc-vip-ns2.wikimedia.org]
- Parameters differences:
--- Bird::Anycast_healthchecker_check[hc-vip-ns2.wikimedia.org].orig
+++ Bird::Anycast_healthchecker_check[hc-vip-ns2.wikimedia.org]
+ address_ipv6 => 2a02:ec80:53::1
+ check_cmd_ipv6 => /usr/local/bin/check_authdns_ns2_state /usr/lib/nagios/plugins/check_dns_query -H 2a02:ec80:53::1 -a -l -d www.wikipedia.org -t 1
@@
- do_ipv6 => False
+ do_ipv6 => True
- Bird::Anycast_healthchecker_check[hc-vip-ns0.wikimedia.org]
- Parameters differences:
--- Bird::Anycast_healthchecker_check[hc-vip-ns0.wikimedia.org].orig
+++ Bird::Anycast_healthchecker_check[hc-vip-ns0.wikimedia.org]
+ address_ipv6 => 2620:0:861:53::1
+ check_cmd_ipv6 => /usr/local/bin/check_authdns_ns0_state /usr/lib/nagios/plugins/check_dns_query -H 2620:0:861:53::1 -a -l -d www.wikipedia.org -t 1
@@
- do_ipv6 => False
+ do_ipv6 => True
- Class[Profile::Bird::Anycast]
- Parameters differences:
--- Class[Profile::Bird::Anycast].orig
+++ Class[Profile::Bird::Anycast]
@@
- do_ipv6 => False
+ do_ipv6 => True
@@
- advertise_vips => {'recdns.anycast.wmnet': {'address': '10.3.0.1', 'check_cmd': '/usr/local/bin/check_recdns_state /usr/lib/nagios/plugins/check_dns_query -H 10.3.0.1 -l -d www.wikipedia.org -t 1', 'ensure': 'present', 'service_type': 'recdns'}, 'ns2.wikimedia.org': {'address': '198.35.27.27', 'check_cmd': '/usr/local/bin/check_authdns_ns2_state /usr/lib/nagios/plugins/check_dns_query -H 198.35.27.27 -a -l -d www.wikipedia.org -t 1', 'ensure': 'present', 'service_type': 'authdns-ns2'}, 'ns0.wikimedia.org': {'address': '208.80.154.238', 'check_cmd': '/usr/local/bin/check_authdns_ns0_state /usr/lib/nagios/plugins/check_dns_query -H 208.80.154.238 -a -l -d www.wikipedia.org -t 1', 'ensure': 'present', 'service_type': 'authdns-ns0'}, 'ntp-a.anycast.wmnet': {'address': '10.3.0.5', 'check_cmd': '/usr/local/bin/check_ntp_a_state /usr/lib/nagios/plugins/check_ntp_peer -H 127.0.0.1 -w 0.05 -c 0.1', 'ensure': 'present', 'service_type': 'ntp-a'}}
+ advertise_vips => {'recdns.anycast.wmnet': {'address': '10.3.0.1', 'check_cmd': '/usr/local/bin/check_recdns_state /usr/lib/nagios/plugins/check_dns_query -H 10.3.0.1 -l -d www.wikipedia.org -t 1', 'ensure': 'present', 'service_type': 'recdns'}, 'ns2.wikimedia.org': {'address': '198.35.27.27', 'check_cmd': '/usr/local/bin/check_authdns_ns2_state /usr/lib/nagios/plugins/check_dns_query -H 198.35.27.27 -a -l -d www.wikipedia.org -t 1', 'address_ipv6': '2a02:ec80:53::1', 'check_cmd_ipv6': '/usr/local/bin/check_authdns_ns2_state /usr/lib/nagios/plugins/check_dns_query -H 2a02:ec80:53::1 -a -l -d www.wikipedia.org -t 1', 'ensure': 'present', 'service_type': 'authdns-ns2'}, 'ns0.wikimedia.org': {'address': '208.80.154.238', 'check_cmd': '/usr/local/bin/check_authdns_ns0_state /usr/lib/nagios/plugins/check_dns_query -H 208.80.154.238 -a -l -d www.wikipedia.org -t 1', 'address_ipv6': '2620:0:861:53::1', 'check_cmd_ipv6': '/usr/local/bin/check_authdns_ns0_state /usr/lib/nagios/plugins/check_dns_query -H 2620:0:861:53::1 -a -l -d www.wikipedia.org -t 1', 'ensure': 'present', 'service_type': 'authdns-ns0'}, 'ntp-a.anycast.wmnet': {'address': '10.3.0.5', 'check_cmd': '/usr/local/bin/check_ntp_a_state /usr/lib/nagios/plugins/check_ntp_peer -H 127.0.0.1 -w 0.05 -c 0.1', 'ensure': 'present', 'service_type': 'ntp-a'}}
- File[/etc/anycast-healthchecker.d/hc-vip-ns2.wikimedia.org.conf]
- Content differences:
--- /etc/anycast-healthchecker.d/hc-vip-ns2.wikimedia.org.conf.orig
+++ /etc/anycast-healthchecker.d/hc-vip-ns2.wikimedia.org.conf
@@ -7,3 +7,13 @@
check_disabled = false
on_disabled = withdraw
ip_prefix = 198.35.27.27/32
+
+[hc-vip-ns2.wikimedia.org.ipv6]
+check_cmd = /usr/local/bin/check_authdns_ns2_state /usr/lib/nagios/plugins/check_dns_query -H 2a02:ec80:53::1 -a -l -d www.wikipedia.org -t 1
+check_interval = 1
+check_timeout = 1
+check_fail = 1
+check_rise = 10
+check_disabled = false
+on_disabled = withdraw
+ip_prefix = 2a02:ec80:53::1/128
Relevant files