--- Class[Profile::Apt].orig
+++ Class[Profile::Apt]
@@
- before => ['Package[puppet]', 'Package[facter]', 'Package[augeas-tools]', 'Package[virt-what]', 'Package[puppet-module-puppetlabs-augeas-core]', 'Package[python3-prometheus-client]', 'Package[python3-yaml]', 'Package[ruby-net-ssh]', 'Package[openssl]', 'Package[ssl-cert]', 'Package[ca-certificates]', 'Package[wmf-certificates]', 'Package[ntp]', 'Package[systemd-timesyncd]', 'Package[exim4-config]', 'Package[exim4-daemon-light]', 'Package[logrotate]', 'Package[prometheus-node-exporter]', 'Package[bsdutils]', 'Package[smartmontools]', 'Package[rsyslog]', 'Package[rsyslog-openssl]', 'Package[cadvisor]', 'Package[prometheus-ethtool-exporter]', 'Package[acct]', 'Package[byobu]', 'Package[colordiff]', 'Package[curl]', 'Package[debian-goodies]', 'Package[ethtool]', 'Package[gdb]', 'Package[gdisk]', 'Package[git]', 'Package[htop]', 'Package[httpry]', 'Package[iotop]', 'Package[iperf]', 'Package[jq]', 'Package[libtemplate-perl]', 'Package[lldpd]', 'Package[lshw]', 'Package[molly-guard]', 'Package[moreutils]', 'Package[net-tools]', 'Package[numactl]', 'Package[ncdu]', 'Package[ngrep]', 'Package[pigz]', 'Package[psmisc]', 'Package[pv]', 'Package[python3]', 'Package[screen]', 'Package[strace]', 'Package[sysstat]', 'Package[tcpdump]', 'Package[tmux]', 'Package[tree]', 'Package[vim]', 'Package[vim-addon-manager]', 'Package[vim-scripts]', 'Package[wipe]', 'Package[xfsprogs]', 'Package[zsh]', 'Package[icdiff]', 'Package[linux-perf]', 'Package[bsd-mailx]', 'Package[ack]', 'Package[netcat-openbsd]', 'Package[tshark]', 'Package[fzf]', 'Package[ripgrep]', 'Package[fd-find]', 'Package[kitty-terminfo]', 'Package[mtr-tiny]', 'Package[bat]', 'Package[efibootmgr]', 'Package[bind9-dnsutils]', 'Package[tzdata]', 'Package[python3-wmflib]', 'Package[ruby-sorted-set]', 'Package[btop]', 'Package[dstat]', 'Package[apport]', 'Package[command-not-found]', 'Package[command-not-found-data]', 'Package[ecryptfs-utils]', 'Package[mlocate]', 'Package[os-prober]', 'Package[python3-apport]', 'Package[wpasupplicant]', 'Package[apt-listchanges]', 'Package[isc-dhcp-client]', 'Package[rasdaemon]', 'Package[libicu67]', 'Package[libwsutil12]', 'Package[libwireshark14]', 'Package[libopencsd0]', 'Package[libwiretap11]', 'Package[ruby2.7]', 'Package[python3.9-minimal]', 'Package[python3.9]', 'Package[perl-modules-5.32]', 'Package[libpython3.9]', 'Package[libperl5.32]', 'Package[libpython3.9-minimal]', 'Package[libpython3.9-stdlib]', 'Package[libidn11]', 'Package[libldap-2.4-2]', 'Package[liburing1]', 'Package[libwebp6]', 'Package[libcbor0]', 'Package[libusb-0.1-4]', 'Package[telnet]', 'Package[libruby2.7]', 'Package[libdns-export1110]', 'Package[libisc-export1105]', 'Package[libbpf0]', 'Package[openssh-client]', 'Package[openssh-server]', 'Package[debdeploy-client]', 'Package[python3-dateutil]', 'Package[sudo]', 'Package[golang-cfssl]', 'Package[debmonitor-client]', 'Package[nagios-nrpe-server]', 'Package[monitoring-plugins]', 'Package[monitoring-plugins-basic]', 'Package[monitoring-plugins-standard]', 'Package[liburiparser1]', 'Package[python3-attr]', 'Package[iucode-tool]', 'Package[freeipmi-tools]', 'Package[freeipmi-ipmiseld]', 'Package[rsyslog-kafka]', 'Package[emacs-nox]', 'Package[prometheus-ipmi-exporter]', 'Package[libnet-dns-perl]', 'Package[iptables]', 'Package[ferm]', 'Package[nftables]', 'Package[conntrack]', 'Package[krb5-kdc]', 'Package[bacula-fd]', 'Package[krb5-admin-server]', 'Package[python3-pexpect]', 'Package[rsync]', 'Package[krb5-kpropd]', 'Package[krb5-user]', 'Package[kstart]', 'Package[prometheus-rsyslog-exporter]', 'Package[initramfs-tools]', 'Package[python3-click]', 'Package[python3-box]', 'Package[confd]', 'Package[python3-toml]']
+ before => ['Package[puppet]', 'Package[facter]', 'Package[augeas-tools]', 'Package[virt-what]', 'Package[puppet-module-puppetlabs-augeas-core]', 'Package[python3-prometheus-client]', 'Package[python3-yaml]', 'Package[ruby-net-ssh]', 'Package[openssl]', 'Package[ssl-cert]', 'Package[ca-certificates]', 'Package[wmf-certificates]', 'Package[ntp]', 'Package[systemd-timesyncd]', 'Package[exim4-config]', 'Package[exim4-daemon-light]', 'Package[logrotate]', 'Package[prometheus-node-exporter]', 'Package[bsdutils]', 'Package[smartmontools]', 'Package[rsyslog]', 'Package[rsyslog-openssl]', 'Package[cadvisor]', 'Package[prometheus-ethtool-exporter]', 'Package[acct]', 'Package[byobu]', 'Package[colordiff]', 'Package[curl]', 'Package[debian-goodies]', 'Package[ethtool]', 'Package[gdb]', 'Package[gdisk]', 'Package[git]', 'Package[htop]', 'Package[httpry]', 'Package[iotop]', 'Package[iperf]', 'Package[jq]', 'Package[libtemplate-perl]', 'Package[lldpd]', 'Package[lshw]', 'Package[molly-guard]', 'Package[moreutils]', 'Package[net-tools]', 'Package[numactl]', 'Package[ncdu]', 'Package[ngrep]', 'Package[pigz]', 'Package[psmisc]', 'Package[pv]', 'Package[python3]', 'Package[screen]', 'Package[strace]', 'Package[sysstat]', 'Package[tcpdump]', 'Package[tmux]', 'Package[tree]', 'Package[vim]', 'Package[vim-addon-manager]', 'Package[vim-scripts]', 'Package[wipe]', 'Package[xfsprogs]', 'Package[zsh]', 'Package[icdiff]', 'Package[linux-perf]', 'Package[bsd-mailx]', 'Package[ack]', 'Package[netcat-openbsd]', 'Package[tshark]', 'Package[fzf]', 'Package[ripgrep]', 'Package[fd-find]', 'Package[kitty-terminfo]', 'Package[mtr-tiny]', 'Package[bat]', 'Package[efibootmgr]', 'Package[bind9-dnsutils]', 'Package[tzdata]', 'Package[python3-wmflib]', 'Package[ruby-sorted-set]', 'Package[btop]', 'Package[dstat]', 'Package[apport]', 'Package[command-not-found]', 'Package[command-not-found-data]', 'Package[ecryptfs-utils]', 'Package[mlocate]', 'Package[os-prober]', 'Package[python3-apport]', 'Package[wpasupplicant]', 'Package[apt-listchanges]', 'Package[isc-dhcp-client]', 'Package[rasdaemon]', 'Package[libicu67]', 'Package[libwsutil12]', 'Package[libwireshark14]', 'Package[libopencsd0]', 'Package[libwiretap11]', 'Package[ruby2.7]', 'Package[python3.9-minimal]', 'Package[python3.9]', 'Package[perl-modules-5.32]', 'Package[libpython3.9]', 'Package[libperl5.32]', 'Package[libpython3.9-minimal]', 'Package[libpython3.9-stdlib]', 'Package[libidn11]', 'Package[libldap-2.4-2]', 'Package[liburing1]', 'Package[libwebp6]', 'Package[libcbor0]', 'Package[libusb-0.1-4]', 'Package[telnet]', 'Package[libruby2.7]', 'Package[libdns-export1110]', 'Package[libisc-export1105]', 'Package[libbpf0]', 'Package[openssh-client]', 'Package[openssh-server]', 'Package[debdeploy-client]', 'Package[python3-dateutil]', 'Package[sudo]', 'Package[golang-cfssl]', 'Package[debmonitor-client]', 'Package[nagios-nrpe-server]', 'Package[monitoring-plugins]', 'Package[monitoring-plugins-basic]', 'Package[monitoring-plugins-standard]', 'Package[liburiparser1]', 'Package[python3-attr]', 'Package[iucode-tool]', 'Package[freeipmi-tools]', 'Package[freeipmi-ipmiseld]', 'Package[rsyslog-kafka]', 'Package[emacs-nox]', 'Package[prometheus-ipmi-exporter]', 'Package[libnet-dns-perl]', 'Package[iptables]', 'Package[ferm]', 'Package[nftables]', 'Package[conntrack]', 'Package[krb5-kdc]', 'Package[bacula-fd]', 'Package[krb5-admin-server]', 'Package[python3-pexpect]', 'Package[krb5-kpropd]', 'Package[krb5-user]', 'Package[kstart]', 'Package[prometheus-rsyslog-exporter]', 'Package[initramfs-tools]', 'Package[python3-click]', 'Package[python3-box]', 'Package[confd]', 'Package[python3-toml]', 'Package[rsync]']
File[/lib/systemd/system/wmf_auto_restart_rsync.service]
- Parameters differences:
--- File[/lib/systemd/system/wmf_auto_restart_rsync.service].orig
+++ File[/lib/systemd/system/wmf_auto_restart_rsync.service]
@@
- ensure => present
+ ensure => absent
- Logrotate::Conf[wmf_auto_restart_krb5-admin-server]
- Parameters differences:
--- Logrotate::Conf[wmf_auto_restart_krb5-admin-server].orig
+++ Logrotate::Conf[wmf_auto_restart_krb5-admin-server]
- ensure => present
- Systemd::Timer[wmf_auto_restart_krb5-kpropd]
- Parameters differences:
--- Systemd::Timer[wmf_auto_restart_krb5-kpropd].orig
+++ Systemd::Timer[wmf_auto_restart_krb5-kpropd]
@@
- ensure => absent
+ ensure => present
- File[/var/log/wmf_auto_restart_krb5-kpropd]
- Parameters differences:
--- File[/var/log/wmf_auto_restart_krb5-kpropd].orig
+++ File[/var/log/wmf_auto_restart_krb5-kpropd]
@@
- ensure => absent
+ ensure => directory
- Systemd::Syslog[wmf_auto_restart_krb5-admin-server]
- Parameters differences:
--- Systemd::Syslog[wmf_auto_restart_krb5-admin-server].orig
+++ Systemd::Syslog[wmf_auto_restart_krb5-admin-server]
- force_stop => True
- group => root
- owner => root
- readable_by => all
- base_dir => /var/log
- log_filename => syslog.log
- ensure => present
- programname_comparison => startswith
- Systemd::Timer::Job[wmf_auto_restart_rsync]
- Parameters differences:
--- Systemd::Timer::Job[wmf_auto_restart_rsync].orig
+++ Systemd::Timer::Job[wmf_auto_restart_rsync]
@@
- ensure => present
+ ensure => absent
- Monitoring::Exported_nagios_service[krb1002 check_replicate-krb-database_status]
- Parameters differences:
--- Monitoring::Exported_nagios_service[krb1002 check_replicate-krb-database_status].orig
+++ Monitoring::Exported_nagios_service[krb1002 check_replicate-krb-database_status]
@@
- ensure => present
+ ensure => absent
- File[/lib/systemd/system/wmf_auto_restart_krb5-kpropd.service]
- Parameters differences:
--- File[/lib/systemd/system/wmf_auto_restart_krb5-kpropd.service].orig
+++ File[/lib/systemd/system/wmf_auto_restart_krb5-kpropd.service]
@@
- ensure => absent
+ ensure => present
- Systemd::Timer::Job[replicate-krb-database]
- Parameters differences:
--- Systemd::Timer::Job[replicate-krb-database].orig
+++ Systemd::Timer::Job[replicate-krb-database]
@@
- ensure => present
+ ensure => absent
- Systemd::Service[wmf_auto_restart_krb5-kpropd]
- Parameters differences:
--- Systemd::Service[wmf_auto_restart_krb5-kpropd].orig
+++ Systemd::Service[wmf_auto_restart_krb5-kpropd]
@@
- ensure => absent
+ ensure => present
- Class[Profile::Kerberos::Kdc]
- Parameters differences:
--- Class[Profile::Kerberos::Kdc].orig
+++ Class[Profile::Kerberos::Kdc]
@@
- krb_kdc_servers => ['krb1002.eqiad.wmnet', 'krb2002.codfw.wmnet']
+ krb_kdc_servers => ['krb2002.codfw.wmnet']
- Systemd::Unit[replicate-krb-database.timer]
- Parameters differences:
--- Systemd::Unit[replicate-krb-database.timer].orig
+++ Systemd::Unit[replicate-krb-database.timer]
@@
- ensure => present
+ ensure => absent
- Motd::Script[inactive_warning]
- Parameters differences:
--- Motd::Script[inactive_warning].orig
+++ Motd::Script[inactive_warning]
@@
- ensure => absent
+ ensure => present
- Ferm::Service[rsyncd_access_srv_keytabs]
- Parameters differences:
--- Ferm::Service[rsyncd_access_srv_keytabs].orig
+++ Ferm::Service[rsyncd_access_srv_keytabs]
@@
- ensure => present
+ ensure => absent
- Service[krb5-admin-server]
- Parameters differences:
--- Service[krb5-admin-server].orig
+++ Service[krb5-admin-server]
- ensure => running
- require => Package[krb5-admin-server]
- Exec[systemd daemon-reload for wmf_auto_restart_krb5-admin-server.timer (wmf_auto_restart_krb5-admin-server.timer)]
- Parameters differences:
--- Exec[systemd daemon-reload for wmf_auto_restart_krb5-admin-server.timer (wmf_auto_restart_krb5-admin-server.timer)].orig
+++ Exec[systemd daemon-reload for wmf_auto_restart_krb5-admin-server.timer (wmf_auto_restart_krb5-admin-server.timer)]
- refreshonly => True
- before => ['Service[wmf_auto_restart_krb5-admin-server.timer]']
- command => /bin/systemctl daemon-reload
- Service[wmf_auto_restart_krb5-admin-server.timer]
- Parameters differences:
--- Service[wmf_auto_restart_krb5-admin-server.timer].orig
+++ Service[wmf_auto_restart_krb5-admin-server.timer]
- ensure => running
- enable => True
- provider => systemd
- Debconf::Set[krb5-config/kerberos_servers]
- Parameters differences:
--- Debconf::Set[krb5-config/kerberos_servers].orig
+++ Debconf::Set[krb5-config/kerberos_servers]
@@
- value => krb1002.eqiad.wmnet krb2002.codfw.wmnet
+ value => krb2002.codfw.wmnet
- Concat::Fragment[/etc/rsyncd.conf-srv-keytabs]
- Parameters differences:
--- Concat::Fragment[/etc/rsyncd.conf-srv-keytabs].orig
+++ Concat::Fragment[/etc/rsyncd.conf-srv-keytabs]
- target => /etc/rsyncd.conf
- order => 10
- Systemd::Timer::Job[wmf_auto_restart_krb5-admin-server]
- Parameters differences:
--- Systemd::Timer::Job[wmf_auto_restart_krb5-admin-server].orig
+++ Systemd::Timer::Job[wmf_auto_restart_krb5-admin-server]
- command => /usr/local/sbin/wmf-auto-restart -s krb5-admin-server
- send_mail_to => root@krb1002.eqiad.wmnet
- private_tmp => False
- logfile_perms => all
- logfile_name => syslog.log
- ignore_errors => False
- logfile_basedir => /var/log
- logfile_group => root
- monitoring_enabled => False
- monitoring_contact_groups => admins
- success_exit_status => []
- send_mail => False
- description => Auto restart job: krb5-admin-server
- syslog_match_startswith => True
- require => File[/usr/local/sbin/wmf-auto-restart]
- send_mail_only_on_error => True
- syslog_force_stop => True
- logging_enabled => True
- fixed_random_delay => False
- user => root
- ensure => present
- environment => {}
- monitoring_notes_url => https://wikitech.wikimedia.org/wiki/Monitoring/systemd_unit_state
- interval => {'start': 'OnCalendar', 'interval': 'Mon,Tue,Wed,Thu,Fri *-*-* 18:18:00'}
- File[/etc/nftables/input/10_kerberos_kpropd_tcp.nft]
- Parameters differences:
--- File[/etc/nftables/input/10_kerberos_kpropd_tcp.nft].orig
+++ File[/etc/nftables/input/10_kerberos_kpropd_tcp.nft]
+ mode => 0444
+ tag => nft
+ notify => ['Service[nftables]']
+ ensure => present
+ group => root
+ owner => root
- Content differences:
--- /etc/nftables/input/10_kerberos_kpropd_tcp.nft.orig
+++ /etc/nftables/input/10_kerberos_kpropd_tcp.nft
@@ -0,0 +1,4 @@
+# Managed by puppet
+#
+ip saddr { 10.192.48.190 } tcp dport { 754 } accept
+ip6 saddr { 2620:0:860:104:10:192:48:190 } tcp dport { 754 } accept
- File[/lib/systemd/system/replicate-krb-database.timer]
- Parameters differences:
--- File[/lib/systemd/system/replicate-krb-database.timer].orig
+++ File[/lib/systemd/system/replicate-krb-database.timer]
@@
- ensure => present
+ ensure => absent
- Profile::Auto_restarts::Service[rsync]
- Parameters differences:
--- Profile::Auto_restarts::Service[rsync].orig
+++ Profile::Auto_restarts::Service[rsync]
@@
- ensure => present
+ ensure => absent
- Systemd::Service[wmf_auto_restart_rsync]
- Parameters differences:
--- Systemd::Service[wmf_auto_restart_rsync].orig
+++ Systemd::Service[wmf_auto_restart_rsync]
@@
- ensure => present
+ ensure => absent
- Class[Profile::Kerberos::Replication]
- Parameters differences:
--- Class[Profile::Kerberos::Replication].orig
+++ Class[Profile::Kerberos::Replication]
@@
- krb_kdc_servers => ['krb1002.eqiad.wmnet', 'krb2002.codfw.wmnet']
+ krb_kdc_servers => ['krb2002.codfw.wmnet']
@@
- krb_kadmin_primary => krb1002.eqiad.wmnet
+ krb_kadmin_primary => krb2002.codfw.wmnet
- Systemd::Unit[replicate-krb-database.service]
- Parameters differences:
--- Systemd::Unit[replicate-krb-database.service].orig
+++ Systemd::Unit[replicate-krb-database.service]
@@
- ensure => present
+ ensure => absent
- Systemd::Service[wmf_auto_restart_krb5-admin-server]
- Parameters differences:
--- Systemd::Service[wmf_auto_restart_krb5-admin-server].orig
+++ Systemd::Service[wmf_auto_restart_krb5-admin-server]
- require => Systemd::Unit[wmf_auto_restart_krb5-admin-server.service]
- override => False
- monitoring_contact_group => admins
- migration_task => T407130
- monitoring_enabled => False
- ensure => present
- unit_type => timer
- restart => False
- service_params => {}
- monitoring_critical => False
- Systemd::Timer::Job[wmf_auto_restart_krb5-kpropd]
- Parameters differences:
--- Systemd::Timer::Job[wmf_auto_restart_krb5-kpropd].orig
+++ Systemd::Timer::Job[wmf_auto_restart_krb5-kpropd]
@@
- ensure => absent
+ ensure => present
- Exec[systemd daemon-reload for wmf_auto_restart_krb5-kpropd.timer (wmf_auto_restart_krb5-kpropd.timer)]
- Parameters differences:
--- Exec[systemd daemon-reload for wmf_auto_restart_krb5-kpropd.timer (wmf_auto_restart_krb5-kpropd.timer)].orig
+++ Exec[systemd daemon-reload for wmf_auto_restart_krb5-kpropd.timer (wmf_auto_restart_krb5-kpropd.timer)]
+ before => ['Service[wmf_auto_restart_krb5-kpropd.timer]']
- File[/etc/rsyslog.d/40-wmf-auto-restart-krb5-kpropd.conf]
- Parameters differences:
--- File[/etc/rsyslog.d/40-wmf-auto-restart-krb5-kpropd.conf].orig
+++ File[/etc/rsyslog.d/40-wmf-auto-restart-krb5-kpropd.conf]
@@
- ensure => absent
+ ensure => present
- File[/var/log/wmf_auto_restart_krb5-admin-server]
- Parameters differences:
--- File[/var/log/wmf_auto_restart_krb5-admin-server].orig
+++ File[/var/log/wmf_auto_restart_krb5-admin-server]
- backup => False
- mode => 0755
- force => True
- ensure => directory
- group => root
- owner => root
- File[/etc/rsyslog.d/40-wmf-auto-restart-krb5-admin-server.conf]
- Parameters differences:
--- File[/etc/rsyslog.d/40-wmf-auto-restart-krb5-admin-server.conf].orig
+++ File[/etc/rsyslog.d/40-wmf-auto-restart-krb5-admin-server.conf]
- mode => 0444
- notify => Service[rsyslog]
- ensure => present
- group => root
- owner => root
- Content differences:
--- /etc/rsyslog.d/40-wmf-auto-restart-krb5-admin-server.conf.orig
+++ /etc/rsyslog.d/40-wmf-auto-restart-krb5-admin-server.conf
@@ -1,10 +0,0 @@
-# rsyslog.conf(5) configuration file for services.
-# This file is managed by Puppet.
-if $programname startswith "wmf_auto_restart_krb5-admin-server" then {
- action(
- type="omfile" file="/var/log/wmf_auto_restart_krb5-admin-server/syslog.log"
- fileOwner="root" fileGroup="root"
- fileCreateMode="0644"
- )
- & stop
-}
- Logrotate::Conf[wmf_auto_restart_krb5-kpropd]
- Parameters differences:
--- Logrotate::Conf[wmf_auto_restart_krb5-kpropd].orig
+++ Logrotate::Conf[wmf_auto_restart_krb5-kpropd]
@@
- ensure => absent
+ ensure => present
- File[/srv/kerberos/rsync_secrets_file]
- Parameters differences:
--- File[/srv/kerberos/rsync_secrets_file].orig
+++ File[/srv/kerberos/rsync_secrets_file]
@@
- ensure => present
+ ensure => absent
- Systemd::Syslog[wmf_auto_restart_krb5-kpropd]
- Parameters differences: