--- Exec[openstack-flamingo-trixie-apt-upgrade].orig
+++ Exec[openstack-flamingo-trixie-apt-upgrade]
@@
- 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[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[starship]', 'Package[ruby-sorted-set]', 'Package[btop]', 'Package[linux-sysctl-defaults]', '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[atop]', 'Package[apt-listchanges]', 'Package[isc-dhcp-client]', 'Package[rasdaemon]', 'Package[openssh-client]', 'Package[openssh-server]', 'Package[debdeploy-client]', 'Package[python3-dateutil]', 'Package[sudo]', 'Package[golang-cfssl]', 'Package[debmonitor-client]', 'Package[perccli]', '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[ulogd2]', 'Package[conntrack]', 'Package[libapache2-mod-auth-openidc]', 'Package[apache2]', 'Package[links]', 'Package[keystone]', 'Package[alembic]', 'Package[ldapvi]', 'Package[python3-ldappool]', 'Package[python3-ldap3]', 'Package[ruby-net-ldap]', 'Package[python3-mwclient]', 'Package[libvirt-clients]', 'Package[python3-pytest]', 'Package[glance]', 'Package[placement-api]', 'Package[cinder-api]', 'Package[cinder-scheduler]', 'Package[cinder-volume]', 'Package[tgt]', 'Package[python3-trove]', 'Package[trove-common]', 'Package[trove-api]', 'Package[trove-taskmanager]', 'Package[trove-conductor]', 'Package[python3-sqlalchemy]', 'Package[designate-sink]', 'Package[designate-common]', 'Package[designate-mdns]', 'Package[designate]', 'Package[designate-api]', 'Package[designate-doc]', 'Package[designate-central]', 'Package[python3-git]', 'Package[mcrouter]', 'Package[radosgw]', 'Package[ceph-common]', 'Package[fio]', 'Package[heat-api]', 'Package[heat-api-cfn]', 'Package[heat-engine]', 'Package[magnum-api]', 'Package[magnum-conductor]', 'Package[python3-magnum-capi-helm]', 'Package[helm3]', 'Package[unzip]', 'Package[bridge-utils]', 'Package[nova-common]', 'Package[nova-conductor]', 'Package[nova-scheduler]', 'Package[nova-api]', 'Package[neutron-common]', 'Package[python3-novaclient]', 'Package[python3-glanceclient]', 'Package[python3-keystoneauth1]', 'Package[python3-keystoneclient]', 'Package[python3-openstackclient]', 'Package[python3-troveclient]', 'Package[python3-designateclient]', 'Package[python3-neutronclient]', 'Package[python3-osc-placement]', 'Package[python3-tenacity]', 'Package[patch]', 'Package[neutron-api]', 'Package[neutron-server]', 'Package[octavia-api]', 'Package[octavia-health-manager]', 'Package[octavia-housekeeping]', 'Package[octavia-worker]', 'Package[python3-octavia]', 'Package[python3-octaviaclient]', 'Package[ldap-utils]', 'Package[memcached]', 'Package[liburi-perl]', 'Package[mariadb-server]', 'Package[mariadb-backup]', 'Package[galera-4]', 'Package[barbican-api]', 'Package[ruby-concurrent]', 'Package[ruby]', 'Package[libruby]', 'Package[puppet-agent]', 'Package[prometheus-rsyslog-exporter]', 'Package[initramfs-tools]', 'Package[python3-click]', 'Package[python3-box]', 'Package[confd]', 'Package[python3-toml]', 'Package[vlan]', 'Package[prometheus-openstack-exporter]', 'Package[rsync]', 'Package[prometheus-memcached-exporter]', 'Package[tofu]', 'Package[prometheus-mysqld-exporter]', 'Package[bacula-fd]', 'Package[bacula-common]']
+ 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[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[starship]', 'Package[ruby-sorted-set]', 'Package[btop]', 'Package[linux-sysctl-defaults]', '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[atop]', 'Package[apt-listchanges]', 'Package[isc-dhcp-client]', 'Package[rasdaemon]', 'Package[openssh-client]', 'Package[openssh-server]', 'Package[debdeploy-client]', 'Package[python3-dateutil]', 'Package[sudo]', 'Package[golang-cfssl]', 'Package[debmonitor-client]', 'Package[perccli]', '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[ulogd2]', 'Package[conntrack]', 'Package[libapache2-mod-auth-openidc]', 'Package[apache2]', 'Package[links]', 'Package[keystone]', 'Package[alembic]', 'Package[ldapvi]', 'Package[python3-ldappool]', 'Package[python3-ldap3]', 'Package[ruby-net-ldap]', 'Package[python3-mwclient]', 'Package[libvirt-clients]', 'Package[python3-pytest]', 'Package[glance]', 'Package[placement-api]', 'Package[cinder-api]', 'Package[cinder-scheduler]', 'Package[cinder-volume]', 'Package[tgt]', 'Package[python3-trove]', 'Package[trove-common]', 'Package[trove-api]', 'Package[trove-taskmanager]', 'Package[trove-conductor]', 'Package[python3-sqlalchemy]', 'Package[designate-sink]', 'Package[designate-common]', 'Package[designate-mdns]', 'Package[designate]', 'Package[designate-api]', 'Package[designate-doc]', 'Package[designate-central]', 'Package[python3-git]', 'Package[mcrouter]', 'Package[zookeeper]', 'Package[zookeeperd]', 'Package[radosgw]', 'Package[ceph-common]', 'Package[fio]', 'Package[heat-api]', 'Package[heat-api-cfn]', 'Package[heat-engine]', 'Package[magnum-api]', 'Package[magnum-conductor]', 'Package[python3-magnum-capi-helm]', 'Package[helm3]', 'Package[unzip]', 'Package[bridge-utils]', 'Package[nova-common]', 'Package[nova-conductor]', 'Package[nova-scheduler]', 'Package[nova-api]', 'Package[neutron-common]', 'Package[python3-novaclient]', 'Package[python3-glanceclient]', 'Package[python3-keystoneauth1]', 'Package[python3-keystoneclient]', 'Package[python3-openstackclient]', 'Package[python3-troveclient]', 'Package[python3-designateclient]', 'Package[python3-neutronclient]', 'Package[python3-osc-placement]', 'Package[python3-tenacity]', 'Package[patch]', 'Package[neutron-api]', 'Package[neutron-server]', 'Package[octavia-api]', 'Package[octavia-health-manager]', 'Package[octavia-housekeeping]', 'Package[octavia-worker]', 'Package[python3-octavia]', 'Package[python3-octaviaclient]', 'Package[ldap-utils]', 'Package[memcached]', 'Package[liburi-perl]', 'Package[mariadb-server]', 'Package[mariadb-backup]', 'Package[galera-4]', 'Package[barbican-api]', 'Package[ruby-concurrent]', 'Package[ruby]', 'Package[libruby]', 'Package[puppet-agent]', 'Package[prometheus-rsyslog-exporter]', 'Package[initramfs-tools]', 'Package[python3-click]', 'Package[python3-box]', 'Package[confd]', 'Package[python3-toml]', 'Package[vlan]', 'Package[prometheus-openstack-exporter]', 'Package[rsync]', 'Package[prometheus-jmx-exporter]', 'Package[openjdk-21-jdk]', 'Package[prometheus-memcached-exporter]', 'Package[tofu]', 'Package[prometheus-mysqld-exporter]', 'Package[bacula-fd]', 'Package[bacula-common]']
Ferm::Service[zookeeper]
- Parameters differences:
--- Ferm::Service[zookeeper].orig
+++ Ferm::Service[zookeeper]
+ port => [2181, 2182, 2183]
+ notrack => False
+ src_sets => ['cloudcontrol2005-dev.private.codfw.wikimedia.cloud', 'cloudcontrol2006-dev.private.codfw.wikimedia.cloud', 'cloudcontrol2010-dev.private.codfw.wikimedia.cloud']
+ ensure => present
+ desc =>
+ proto => tcp
+ prio => 10
- Exec[systemd daemon-reload for zookeeper-cleanup.timer (zookeeper-cleanup.timer)]
- Parameters differences:
--- Exec[systemd daemon-reload for zookeeper-cleanup.timer (zookeeper-cleanup.timer)].orig
+++ Exec[systemd daemon-reload for zookeeper-cleanup.timer (zookeeper-cleanup.timer)]
+ command => /bin/systemctl daemon-reload
+ refreshonly => True
+ before => ['Service[zookeeper-cleanup.timer]']
- File[/var/lib/zookeeper/myid]
- Parameters differences:
--- File[/var/lib/zookeeper/myid].orig
+++ File[/var/lib/zookeeper/myid]
+ target => /etc/zookeeper/conf/myid
+ group => root
+ owner => root
+ ensure => link
- Exec[java__cacert_wmf:Wikimedia_Internal_Root_CA]
- Parameters differences:
--- Exec[java__cacert_wmf:Wikimedia_Internal_Root_CA].orig
+++ Exec[java__cacert_wmf:Wikimedia_Internal_Root_CA]
+ command => /usr/bin/keytool -import -trustcacerts -noprompt -cacerts -file /usr/share/ca-certificates/wikimedia/Wikimedia_Internal_Root_CA.crt -storepass changeit -alias wmf:Wikimedia_Internal_Root_CA
+ unless => /usr/bin/keytool -list -cacerts -noprompt -storepass changeit -alias wmf:Wikimedia_Internal_Root_CA
+ group => root
+ user => root
- File[/etc/zookeeper/conf/myid]
- Parameters differences:
--- File[/etc/zookeeper/conf/myid].orig
+++ File[/etc/zookeeper/conf/myid]
+ group => root
+ owner => root
- Content differences:
--- /etc/zookeeper/conf/myid.orig
+++ /etc/zookeeper/conf/myid
@@ -0,0 +1 @@
+2010
- Prometheus::Jmx_exporter_instance[zookeeper_server_cloudcontrol2010-dev]
- Parameters differences:
--- Prometheus::Jmx_exporter_instance[zookeeper_server_cloudcontrol2010-dev].orig
+++ Prometheus::Jmx_exporter_instance[zookeeper_server_cloudcontrol2010-dev]
+ port => 12181
+ labels => {'zookeeper_cluster': 'designate_eqiad1'}
+ hostname => cloudcontrol2010-dev
- Exec[systemd daemon-reload for zookeeper-cleanup.service (zookeeper-cleanup.service)]
- Parameters differences:
--- Exec[systemd daemon-reload for zookeeper-cleanup.service (zookeeper-cleanup.service)].orig
+++ Exec[systemd daemon-reload for zookeeper-cleanup.service (zookeeper-cleanup.service)]
+ command => /bin/systemctl daemon-reload
+ refreshonly => True
- Package[zookeeperd]
- Parameters differences:
--- Package[zookeeperd].orig
+++ Package[zookeeperd]
+ provider => apt
+ ensure => installed
- Service[zookeeper-cleanup.timer]
- Parameters differences:
--- Service[zookeeper-cleanup.timer].orig
+++ Service[zookeeper-cleanup.timer]
+ provider => systemd
+ enable => True
+ ensure => running
- Class[Adduser]
- Parameters differences:
--- Class[Adduser].orig
+++ Class[Adduser]
@@
- 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[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[starship]', 'Package[ruby-sorted-set]', 'Package[btop]', 'Package[linux-sysctl-defaults]', '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[atop]', 'Package[apt-listchanges]', 'Package[isc-dhcp-client]', 'Package[rasdaemon]', 'Package[openssh-client]', 'Package[openssh-server]', 'Package[debdeploy-client]', 'Package[python3-dateutil]', 'Package[sudo]', 'Package[golang-cfssl]', 'Package[debmonitor-client]', 'Package[perccli]', '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[ulogd2]', 'Package[conntrack]', 'Package[libapache2-mod-auth-openidc]', 'Package[apache2]', 'Package[links]', 'Package[keystone]', 'Package[alembic]', 'Package[ldapvi]', 'Package[python3-ldappool]', 'Package[python3-ldap3]', 'Package[ruby-net-ldap]', 'Package[python3-mwclient]', 'Package[libvirt-clients]', 'Package[python3-pytest]', 'Package[glance]', 'Package[placement-api]', 'Package[cinder-api]', 'Package[cinder-scheduler]', 'Package[cinder-volume]', 'Package[tgt]', 'Package[python3-trove]', 'Package[trove-common]', 'Package[trove-api]', 'Package[trove-taskmanager]', 'Package[trove-conductor]', 'Package[python3-sqlalchemy]', 'Package[designate-sink]', 'Package[designate-common]', 'Package[designate-mdns]', 'Package[designate]', 'Package[designate-api]', 'Package[designate-doc]', 'Package[designate-central]', 'Package[python3-git]', 'Package[mcrouter]', 'Package[radosgw]', 'Package[ceph-common]', 'Package[fio]', 'Package[heat-api]', 'Package[heat-api-cfn]', 'Package[heat-engine]', 'Package[magnum-api]', 'Package[magnum-conductor]', 'Package[python3-magnum-capi-helm]', 'Package[helm3]', 'Package[unzip]', 'Package[bridge-utils]', 'Package[nova-common]', 'Package[nova-conductor]', 'Package[nova-scheduler]', 'Package[nova-api]', 'Package[neutron-common]', 'Package[python3-novaclient]', 'Package[python3-glanceclient]', 'Package[python3-keystoneauth1]', 'Package[python3-keystoneclient]', 'Package[python3-openstackclient]', 'Package[python3-troveclient]', 'Package[python3-designateclient]', 'Package[python3-neutronclient]', 'Package[python3-osc-placement]', 'Package[python3-tenacity]', 'Package[patch]', 'Package[neutron-api]', 'Package[neutron-server]', 'Package[octavia-api]', 'Package[octavia-health-manager]', 'Package[octavia-housekeeping]', 'Package[octavia-worker]', 'Package[python3-octavia]', 'Package[python3-octaviaclient]', 'Package[ldap-utils]', 'Package[memcached]', 'Package[liburi-perl]', 'Package[mariadb-server]', 'Package[mariadb-backup]', 'Package[galera-4]', 'Package[barbican-api]', 'Package[ruby-concurrent]', 'Package[ruby]', 'Package[libruby]', 'Package[puppet-agent]', 'Package[prometheus-rsyslog-exporter]', 'Package[initramfs-tools]', 'Package[python3-click]', 'Package[python3-box]', 'Package[confd]', 'Package[python3-toml]', 'Package[vlan]', 'Package[prometheus-openstack-exporter]', 'Package[rsync]', 'Package[prometheus-memcached-exporter]', 'Package[tofu]', 'Package[prometheus-mysqld-exporter]', 'Package[bacula-fd]', 'Package[bacula-common]']
+ 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[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[starship]', 'Package[ruby-sorted-set]', 'Package[btop]', 'Package[linux-sysctl-defaults]', '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[atop]', 'Package[apt-listchanges]', 'Package[isc-dhcp-client]', 'Package[rasdaemon]', 'Package[openssh-client]', 'Package[openssh-server]', 'Package[debdeploy-client]', 'Package[python3-dateutil]', 'Package[sudo]', 'Package[golang-cfssl]', 'Package[debmonitor-client]', 'Package[perccli]', '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[ulogd2]', 'Package[conntrack]', 'Package[libapache2-mod-auth-openidc]', 'Package[apache2]', 'Package[links]', 'Package[keystone]', 'Package[alembic]', 'Package[ldapvi]', 'Package[python3-ldappool]', 'Package[python3-ldap3]', 'Package[ruby-net-ldap]', 'Package[python3-mwclient]', 'Package[libvirt-clients]', 'Package[python3-pytest]', 'Package[glance]', 'Package[placement-api]', 'Package[cinder-api]', 'Package[cinder-scheduler]', 'Package[cinder-volume]', 'Package[tgt]', 'Package[python3-trove]', 'Package[trove-common]', 'Package[trove-api]', 'Package[trove-taskmanager]', 'Package[trove-conductor]', 'Package[python3-sqlalchemy]', 'Package[designate-sink]', 'Package[designate-common]', 'Package[designate-mdns]', 'Package[designate]', 'Package[designate-api]', 'Package[designate-doc]', 'Package[designate-central]', 'Package[python3-git]', 'Package[mcrouter]', 'Package[zookeeper]', 'Package[zookeeperd]', 'Package[radosgw]', 'Package[ceph-common]', 'Package[fio]', 'Package[heat-api]', 'Package[heat-api-cfn]', 'Package[heat-engine]', 'Package[magnum-api]', 'Package[magnum-conductor]', 'Package[python3-magnum-capi-helm]', 'Package[helm3]', 'Package[unzip]', 'Package[bridge-utils]', 'Package[nova-common]', 'Package[nova-conductor]', 'Package[nova-scheduler]', 'Package[nova-api]', 'Package[neutron-common]', 'Package[python3-novaclient]', 'Package[python3-glanceclient]', 'Package[python3-keystoneauth1]', 'Package[python3-keystoneclient]', 'Package[python3-openstackclient]', 'Package[python3-troveclient]', 'Package[python3-designateclient]', 'Package[python3-neutronclient]', 'Package[python3-osc-placement]', 'Package[python3-tenacity]', 'Package[patch]', 'Package[neutron-api]', 'Package[neutron-server]', 'Package[octavia-api]', 'Package[octavia-health-manager]', 'Package[octavia-housekeeping]', 'Package[octavia-worker]', 'Package[python3-octavia]', 'Package[python3-octaviaclient]', 'Package[ldap-utils]', 'Package[memcached]', 'Package[liburi-perl]', 'Package[mariadb-server]', 'Package[mariadb-backup]', 'Package[galera-4]', 'Package[barbican-api]', 'Package[ruby-concurrent]', 'Package[ruby]', 'Package[libruby]', 'Package[puppet-agent]', 'Package[prometheus-rsyslog-exporter]', 'Package[initramfs-tools]', 'Package[python3-click]', 'Package[python3-box]', 'Package[confd]', 'Package[python3-toml]', 'Package[vlan]', 'Package[prometheus-openstack-exporter]', 'Package[rsync]', 'Package[prometheus-jmx-exporter]', 'Package[openjdk-21-jdk]', 'Package[prometheus-memcached-exporter]', 'Package[tofu]', 'Package[prometheus-mysqld-exporter]', 'Package[bacula-fd]', 'Package[bacula-common]']
- Service[zookeeper]
- Parameters differences:
--- Service[zookeeper].orig
+++ Service[zookeeper]
+ hasstatus => True
+ require => ['Package[zookeeperd]', 'File[/var/lib/zookeeper]', 'File[/var/lib/zookeeper/myid]', 'File[/etc/default/zookeeper]', 'File[/etc/zookeeper/conf/zoo.cfg]', 'File[/etc/zookeeper/conf/myid]', 'File[/etc/zookeeper/conf/log4j.properties]']
+ hasrestart => True
+ ensure => running
- Class[Profile::Zookeeper::Firewall]
- Parameters differences:
--- Class[Profile::Zookeeper::Firewall].orig
+++ Class[Profile::Zookeeper::Firewall]
+ firewall_access => ['cloudcontrol2005-dev.private.codfw.wikimedia.cloud', 'cloudcontrol2006-dev.private.codfw.wikimedia.cloud', 'cloudcontrol2010-dev.private.codfw.wikimedia.cloud']
- File[/etc/ferm/conf.d/10_zookeeper]
- Parameters differences:
--- File[/etc/ferm/conf.d/10_zookeeper].orig
+++ File[/etc/ferm/conf.d/10_zookeeper]
+ mode => 0400
+ group => root
+ owner => root
+ tag => ferm
+ notify => Service[ferm]
+ ensure => present
+ require => File[/etc/ferm/conf.d]
- Content differences:
--- /etc/ferm/conf.d/10_zookeeper.orig
+++ /etc/ferm/conf.d/10_zookeeper
@@ -0,0 +1,6 @@
+# Autogenerated by puppet. DO NOT EDIT BY HAND!
+#
+#
+&R_SERVICE(tcp, (2181 2182 2183), ($cloudcontrol2005-dev.private.codfw.wikimedia.cloud $cloudcontrol2006-dev.private.codfw.wikimedia.cloud $cloudcontrol2010-dev.private.codfw.wikimedia.cloud));
+
+
- Systemd::Timer::Job[zookeeper-cleanup]
- Parameters differences:
--- Systemd::Timer::Job[zookeeper-cleanup].orig
+++ Systemd::Timer::Job[zookeeper-cleanup]
+ command => /usr/share/zookeeper/bin/zkCleanup.sh -n 10
+ user => zookeeper
+ environment => {}
+ private_tmp => False
+ logfile_group => root
+ success_exit_status => []
+ fixed_random_delay => False
+ logfile_perms => all
+ send_mail_only_on_error => True
+ logging_enabled => True
+ ignore_errors => False
+ ensure => present
+ syslog_force_stop => True
+ monitoring_enabled => False
+ monitoring_contact_groups => admins
+ send_mail_to => root@cloudcontrol2010-dev.codfw.wmnet
+ monitoring_notes_url => https://wikitech.wikimedia.org/wiki/Monitoring/systemd_unit_state
+ description => Regular jobs for running the cleanup script
+ logfile_name => syslog.log
+ interval => {'start': 'OnCalendar', 'interval': '*-*-* 0:10:00'}
+ require => Service[zookeeper]
+ logfile_basedir => /var/log
+ syslog_match_startswith => True
+ send_mail => False
- Java::Cacert[wmf:puppetca.pem]
- Parameters differences:
--- Java::Cacert[wmf:puppetca.pem].orig
+++ Java::Cacert[wmf:puppetca.pem]
+ storepass => changeit
+ path => /etc/ssl/certs/Puppet_Internal_CA.pem
+ group => root
+ owner => root
+ ensure => present
+ require => Alternatives::Java[21]
- Package[prometheus-jmx-exporter]
- Parameters differences:
--- Package[prometheus-jmx-exporter].orig
+++ Package[prometheus-jmx-exporter]
+ provider => apt
+ ensure => installed
- Class[Profile::Java]
- Parameters differences:
--- Class[Profile::Java].orig
+++ Class[Profile::Java]
+ hardened_tls => False
+ enable_dbg => False
+ extra_args => {}
+ trust_puppet_ca => True
+ egd_source => /dev/random
+ java_packages => []
- Exec[update_java_alternatives_21]
- Parameters differences:
--- Exec[update_java_alternatives_21].orig
+++ Exec[update_java_alternatives_21]
+ command => /usr/sbin/update-java-alternatives -s /usr/lib/jvm/java-1.21.0-openjdk-amd64
+ unless => /usr/bin/update-alternatives --query java | /bin/grep 'Value: /usr/lib/jvm/java-21-openjdk-amd64'
- Systemd::Timer[zookeeper-cleanup]
- Parameters differences:
--- Systemd::Timer[zookeeper-cleanup].orig
+++ Systemd::Timer[zookeeper-cleanup]
+ timer_intervals => [{'start': 'OnCalendar', 'interval': '*-*-* 0:10:00'}]
+ splay => 0
+ ensure => present
+ accuracy => 15sec
+ fixed_random_delay => False
+ unit_name => zookeeper-cleanup.service
- File[/etc/prometheus/jvm_zookeeper_jmx_exporter.yaml]
- Parameters differences:
--- File[/etc/prometheus/jvm_zookeeper_jmx_exporter.yaml].orig
+++ File[/etc/prometheus/jvm_zookeeper_jmx_exporter.yaml]
+ mode => 0444
+ group => root
+ owner => root
+ links => follow
+ ensure => present
+ source => puppet:///modules/profile/zookeeper/jvm_prometheus_jmx_exporter.yaml
- File[/var/lib/zookeeper]
- Parameters differences:
--- File[/var/lib/zookeeper].orig
+++ File[/var/lib/zookeeper]
+ mode => 0755
+ group => zookeeper
+ owner => zookeeper
+ ensure => directory
- File[/etc/prometheus]
- Parameters differences:
--- File[/etc/prometheus].orig
+++ File[/etc/prometheus]
+ mode => 0444
+ group => root
+ owner => root
+ ensure => directory
- Alternatives::Java[21]
- Parameters differences:
--- Alternatives::Java[21].orig
+++ Alternatives::Java[21]
+ require => Java::Package[openjdk-jdk-21]
- File[/etc/zookeeper/conf/log4j.properties]
- Parameters differences:
--- File[/etc/zookeeper/conf/log4j.properties].orig
+++ File[/etc/zookeeper/conf/log4j.properties]
+ group => root
+ owner => root
+ require => Package[zookeeperd]
- Content differences:
--- /etc/zookeeper/conf/log4j.properties.orig
+++ /etc/zookeeper/conf/log4j.properties
@@ -0,0 +1,31 @@
+# Note: This file is managed by Puppet.
+
+#
+# ZooKeeper Logging Configuration
+#
+
+# Format is "<default threshold> (, <appender>)+
+
+log4j.rootLogger=${zookeeper.root.logger}, ROLLINGFILE
+
+#
+# Log INFO level and above messages to the console
+#
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.Threshold=INFO
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=%d{ISO8601} - %-5p [%t:%C{1}@%L] - %m%n
+
+#
+# Add ROLLINGFILE to rootLogger to get log file output
+# Log INFO level and above messages to a log file
+log4j.appender.ROLLINGFILE=org.apache.log4j.RollingFileAppender
+log4j.appender.ROLLINGFILE.Threshold=INFO
+log4j.appender.ROLLINGFILE.File=${zookeeper.log.dir}/zookeeper.log
+
+# Max log file size of 10MB
+log4j.appender.ROLLINGFILE.MaxFileSize=10MB
+# Keep only 10 files
+log4j.appender.ROLLINGFILE.MaxBackupIndex=10
+log4j.appender.ROLLINGFILE.layout=org.apache.log4j.PatternLayout
+log4j.appender.ROLLINGFILE.layout.ConversionPattern=%d{ISO8601} - %-5p [%t:%C{1}@%L] - %m%n
- File[/var/log/zookeeper-cleanup]
- Parameters differences:
--- File[/var/log/zookeeper-cleanup].orig
+++ File[/var/log/zookeeper-cleanup]
+ mode => 0755
+ force => True
+ group => root
+ backup => False
+ owner => zookeeper
+ ensure => directory
- Class[Profile::Zookeeper::Monitoring::Server]
- Parameters differences:
--- Class[Profile::Zookeeper::Monitoring::Server].orig
+++ Class[Profile::Zookeeper::Monitoring::Server]
+ cluster_name => designate_eqiad1
- File[/lib/systemd/system/zookeeper-cleanup.service]
- Parameters differences:
--- File[/lib/systemd/system/zookeeper-cleanup.service].orig
+++ File[/lib/systemd/system/zookeeper-cleanup.service]
+ mode => 0444
+ group => root
+ owner => root
+ notify => Exec[systemd daemon-reload for zookeeper-cleanup.service (zookeeper-cleanup.service)]
+ ensure => present
- Content differences:
--- /lib/systemd/system/zookeeper-cleanup.service.orig
+++ /lib/systemd/system/zookeeper-cleanup.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Regular jobs for running the cleanup script
+Documentation=https://wikitech.wikimedia.org/wiki/Monitoring/systemd_unit_state
+
+[Service]
+Type=oneshot
+User=zookeeper
+ExecStart=/usr/share/zookeeper/bin/zkCleanup.sh -n 10
- File[/etc/rsyslog.d/40-zookeeper-cleanup.conf]
- Parameters differences:
--- File[/etc/rsyslog.d/40-zookeeper-cleanup.conf].orig
+++ File[/etc/rsyslog.d/40-zookeeper-cleanup.conf]
+ mode => 0444
+ group => root
+ owner => root
+ notify => Service[rsyslog]
+ ensure => present
- Content differences:
--- /etc/rsyslog.d/40-zookeeper-cleanup.conf.orig
+++ /etc/rsyslog.d/40-zookeeper-cleanup.conf
@@ -0,0 +1,10 @@
+# rsyslog.conf(5) configuration file for services.
+# This file is managed by Puppet.
+if $programname startswith "zookeeper-cleanup" then {
+ action(
+ type="omfile" file="/var/log/zookeeper-cleanup/syslog.log"
+ fileOwner="zookeeper" fileGroup="root"
+ fileCreateMode="0644"
+ )
+ & stop
+}
- Package[openjdk-21-jdk]
- Parameters differences:
--- Package[openjdk-21-jdk].orig
+++ Package[openjdk-21-jdk]
+ provider => apt
+ ensure => installed
- Package[zookeeper]
- Parameters differences:
--- Package[zookeeper].orig
+++ Package[zookeeper]
+ provider => apt
+ ensure => installed
- Rsyslog::Conf[zookeeper-cleanup]
- Parameters differences:
--- Rsyslog::Conf[zookeeper-cleanup].orig
+++ Rsyslog::Conf[zookeeper-cleanup]
+ mode => 0444
+ priority => 40
+ require => File[/var/log/zookeeper-cleanup]
+ ensure => present
- Logrotate::Conf[zookeeper-cleanup]
- Parameters differences:
--- Logrotate::Conf[zookeeper-cleanup].orig
+++ Logrotate::Conf[zookeeper-cleanup]
+ ensure => present
- Java::Cacert[wmf:Wikimedia_Internal_Root_CA]
- Parameters differences:
--- Java::Cacert[wmf:Wikimedia_Internal_Root_CA].orig
+++ Java::Cacert[wmf:Wikimedia_Internal_Root_CA]
+ storepass => changeit
+ path => /usr/share/ca-certificates/wikimedia/Wikimedia_Internal_Root_CA.crt
+ group => root
+ owner => root
+ ensure => present
+ require => Alternatives::Java[21]
- File[/etc/zookeeper/conf/zoo.cfg]
- Parameters differences:
--- File[/etc/zookeeper/conf/zoo.cfg].orig
+++ File[/etc/zookeeper/conf/zoo.cfg]
+ group => root
+ owner => root
+ require => Package[zookeeper]
- Content differences:
--- /etc/zookeeper/conf/zoo.cfg.orig
+++ /etc/zookeeper/conf/zoo.cfg
@@ -0,0 +1,65 @@
+# Note: This file is managed by Puppet.
+
+# http://hadoop.apache.org/zookeeper/docs/current/zookeeperAdmin.html
+
+# https://zookeeper.apache.org/doc/r3.4.10/zookeeperAdmin.html#sc_zkCommands
+# T365400 Really we should check zk version >= 3.4.10 but for now just check os
+4lw.commands.whitelist=*
+
+# specify all zookeeper servers
+# The first port is used by followers to connect to the leader
+# The second one is used for leader election
+server.2005=cloudcontrol2005-dev.codfw.wmnet:2182:2183
+server.2006=cloudcontrol2006-dev.codfw.wmnet:2182:2183
+server.2010=cloudcontrol2010-dev.codfw.wmnet:2182:2183
+
+# the port at which the clients will connect
+clientPort=2181
+
+# the directory where the snapshot is stored.
+dataDir=/var/lib/zookeeper
+
+# Place the dataLogDir to a separate physical disc for better performance
+# dataLogDir=/disk2/zookeeper
+
+
+# The maximum number of connections per IP, 0 == unlimited
+maxClientCnxns=1024
+
+# The number of milliseconds of each tick.
+tickTime=2000
+
+# The number of ticks that the initial
+# synchronization phase can take.
+initLimit=10
+
+# The number of ticks that can pass between
+# sending a request and getting an acknowledgement
+syncLimit=8
+
+# To avoid seeks ZooKeeper allocates space in the transaction log file in
+# blocks of preAllocSize kilobytes. The default block size is 64M. One reason
+# for changing the size of the blocks is to reduce the block size if snapshots
+# are taken more often. (Also, see snapCount).
+#preAllocSize=65536
+
+# Clients can submit requests faster than ZooKeeper can process them,
+# especially if there are a lot of clients. To prevent ZooKeeper from running
+# out of memory due to queued requests, ZooKeeper will throttle clients so that
+# there is no more than globalOutstandingLimit outstanding requests in the
+# system. The default limit is 1,000.ZooKeeper logs transactions to a
+# transaction log. After snapCount transactions are written to a log file a
+# snapshot is started and a new transaction log file is started. The default
+# snapCount is 10,000.
+#snapCount=1000
+
+# If this option is defined, requests will be will logged to a trace file named
+# traceFile.year.month.day.
+#traceFile=
+
+# Leader accepts client connections. Default value is "yes". The leader machine
+# coordinates updates. For higher update throughput at thes slight expense of
+# read throughput the leader can be configured to not accept clients and focus
+# on coordination.
+#leaderServes=yes
+
- Class[Java]
- Parameters differences:
--- Class[Java].orig
+++ Class[Java]
+ hardened_tls => False
+ java_packages => [{'version': '21', 'variant': 'jdk'}]
+ enable_dbg => False
+ egd_source => /dev/random
+ before => ['Java::Cacert[wmf:puppetca.pem]', 'Java::Cacert[wmf:Wikimedia_Internal_Root_CA]', 'Java::Cacert[wmf:puppetca.pem]', 'Java::Cacert[wmf:Wikimedia_Internal_Root_CA]']
+ require => Package[wmf-certificates]
- File[/lib/systemd/system/zookeeper-cleanup.timer]
- Parameters differences:
--- File[/lib/systemd/system/zookeeper-cleanup.timer].orig
+++ File[/lib/systemd/system/zookeeper-cleanup.timer]
+ mode => 0444
+ group => root
+ owner => root
+ notify => Exec[systemd daemon-reload for zookeeper-cleanup.timer (zookeeper-cleanup.timer)]
+ ensure => present
- Content differences:
--- /lib/systemd/system/zookeeper-cleanup.timer.orig
+++ /lib/systemd/system/zookeeper-cleanup.timer
@@ -0,0 +1,12 @@
+[Unit]
+Description=Periodic execution of zookeeper-cleanup.service
+
+[Timer]
+Unit=zookeeper-cleanup.service
+# Accuracy sets the maximum time interval around the execution time we want to allow
+AccuracySec=15sec
+OnCalendar=*-*-* 0:10:00
+RandomizedDelaySec=0
+
+[Install]
+WantedBy=multi-user.target
- File[/etc/default/zookeeper]
- Parameters differences:
--- File[/etc/default/zookeeper].orig
+++ File[/etc/default/zookeeper]
+ group => root
+ owner => root
+ require => Package[zookeeperd]
- Content differences:
--- /etc/default/zookeeper.orig
+++ /etc/default/zookeeper
@@ -0,0 +1,6 @@
+# Note: This file is managed by Puppet.
+
+# Enable JMX connections on port 9998
+JMXLOCALONLY=false
+JAVA_OPTS="-Xms1g -Xmx1g -javaagent:/usr/share/java/prometheus/jmx_prometheus_javaagent.jar=10.192.20.8:12181:/etc/prometheus/jvm_zookeeper_jmx_exporter.yaml -Dcom.sun.management.jmxremote.port=9998 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false"
+JAVA=/usr/lib/jvm/java-21-openjdk-amd64/bin/java
- Systemd::Service[zookeeper-cleanup]
- Parameters differences:
--- Systemd::Service[zookeeper-cleanup].orig
+++ Systemd::Service[zookeeper-cleanup]
+ unit_type => timer
+ monitoring_contact_group => admins
+ restart => False
+ migration_task => T407130
+ require => Systemd::Unit[zookeeper-cleanup.service]
+ monitoring_critical => False
+ override => False
+ service_params => {}
+ ensure => present
+ monitoring_enabled => False
- Systemd::Syslog[zookeeper-cleanup]
- Parameters differences:
--- Systemd::Syslog[zookeeper-cleanup].orig
+++ Systemd::Syslog[zookeeper-cleanup]
+ group => root
+ force_stop => True
+ base_dir => /var/log
+ owner => zookeeper
+ ensure => present
+ log_filename => syslog.log
+ programname_comparison => startswith
+ readable_by => all
- File[/etc/logrotate.d/zookeeper-cleanup]
- Parameters differences:
--- File[/etc/logrotate.d/zookeeper-cleanup].orig
+++ File[/etc/logrotate.d/zookeeper-cleanup]
+ mode => 0444
+ group => root
+ owner => root
+ ensure => present
- Content differences:
--- /etc/logrotate.d/zookeeper-cleanup.orig
+++ /etc/logrotate.d/zookeeper-cleanup
@@ -0,0 +1,12 @@
+# logrotate(8) config for zookeeper-cleanup
+
+/var/log/zookeeper-cleanup/*.log {
+ daily
+ copytruncate
+ missingok
+ compress
+ delaycompress
+ notifempty
+ rotate 15
+ size 256M
+}
- Class[Zookeeper]
- Parameters differences:
--- Class[Zookeeper].orig
+++ Class[Zookeeper]
+ tick_time => 2000
+ sync_limit => 8
+ max_client_connections => 1024
+ enable_tls => False
+ conf_template => profile/zookeeper/zoo.cfg.erb
+ init_limit => 10
+ data_dir => /var/lib/zookeeper
+ hosts => {'cloudcontrol2005-dev.codfw.wmnet': '2005', 'cloudcontrol2006-dev.codfw.wmnet': '2006', 'cloudcontrol2010-dev.codfw.wmnet': '2010'}
+ before => ['Class[Zookeeper::Server]']
- Exec[java__cacert_wmf:puppetca.pem]
- Parameters differences:
--- Exec[java__cacert_wmf:puppetca.pem].orig
+++ Exec[java__cacert_wmf:puppetca.pem]
+ command => /usr/bin/keytool -import -trustcacerts -noprompt -cacerts -file /etc/ssl/certs/Puppet_Internal_CA.pem -storepass changeit -alias wmf:puppetca.pem
+ unless => /usr/bin/keytool -list -cacerts -noprompt -storepass changeit -alias wmf:puppetca.pem
+ group => root
+ user => root
- Java::Package[openjdk-jdk-21]
- Parameters differences:
--- Java::Package[openjdk-jdk-21].orig
+++ Java::Package[openjdk-jdk-21]
+ hardened_tls => False
+ package_info => {'version': '21', 'variant': 'jdk'}
+ egd_source => /dev/random
- Systemd::Unit[zookeeper-cleanup.service]
- Parameters differences:
--- Systemd::Unit[zookeeper-cleanup.service].orig
+++ Systemd::Unit[zookeeper-cleanup.service]
+ override_filename => puppet-override.conf
+ override => False
+ unit => zookeeper-cleanup.service
+ ensure => present
+ restart => False
+ require => ['Class[Systemd]']
- Systemd::Unit[zookeeper-cleanup.timer]
- Parameters differences:
--- Systemd::Unit[zookeeper-cleanup.timer].orig
+++ Systemd::Unit[zookeeper-cleanup.timer]
+ override_filename => puppet-override.conf
+ override => False
+ unit => zookeeper-cleanup.timer
+ ensure => present
+ restart => False
+ require => ['Class[Systemd]']
- Class[Profile::Zookeeper::Server]
- Parameters differences:
--- Class[Profile::Zookeeper::Server].orig
+++ Class[Profile::Zookeeper::Server]
+ sync_limit => 8
+ is_critical => False
+ prometheus_instance => ops
+ monitoring_contact_group => admins
+ cluster_name => designate_eqiad1
+ max_client_connections => 1024
+ enable_tls => False
+ require => ['Class[Profile::Java]', 'Class[Profile::Zookeeper::Monitoring::Server]']
+ clusters => {'designate_eqiad1': {'hosts': {'cloudcontrol2005-dev.codfw.wmnet': '2005', 'cloudcontrol2006-dev.codfw.wmnet': '2006', 'cloudcontrol2010-dev.codfw.wmnet': '2010'}}}
+ monitoring_enabled => False
- Class[Profile::Apt]
- Parameters differences:
--- 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[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[starship]', 'Package[ruby-sorted-set]', 'Package[btop]', 'Package[linux-sysctl-defaults]', '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[atop]', 'Package[apt-listchanges]', 'Package[isc-dhcp-client]', 'Package[rasdaemon]', 'Package[openssh-client]', 'Package[openssh-server]', 'Package[debdeploy-client]', 'Package[python3-dateutil]', 'Package[sudo]', 'Package[golang-cfssl]', 'Package[debmonitor-client]', 'Package[perccli]', '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[ulogd2]', 'Package[conntrack]', 'Package[libapache2-mod-auth-openidc]', 'Package[apache2]', 'Package[links]', 'Package[keystone]', 'Package[alembic]', 'Package[ldapvi]', 'Package[python3-ldappool]', 'Package[python3-ldap3]', 'Package[ruby-net-ldap]', 'Package[python3-mwclient]', 'Package[libvirt-clients]', 'Package[python3-pytest]', 'Package[glance]', 'Package[placement-api]', 'Package[cinder-api]', 'Package[cinder-scheduler]', 'Package[cinder-volume]', 'Package[tgt]', 'Package[python3-trove]', 'Package[trove-common]', 'Package[trove-api]', 'Package[trove-taskmanager]', 'Package[trove-conductor]', 'Package[python3-sqlalchemy]', 'Package[designate-sink]', 'Package[designate-common]', 'Package[designate-mdns]', 'Package[designate]', 'Package[designate-api]', 'Package[designate-doc]', 'Package[designate-central]', 'Package[python3-git]', 'Package[mcrouter]', 'Package[radosgw]', 'Package[ceph-common]', 'Package[fio]', 'Package[heat-api]', 'Package[heat-api-cfn]', 'Package[heat-engine]', 'Package[magnum-api]', 'Package[magnum-conductor]', 'Package[python3-magnum-capi-helm]', 'Package[helm3]', 'Package[unzip]', 'Package[bridge-utils]', 'Package[nova-common]', 'Package[nova-conductor]', 'Package[nova-scheduler]', 'Package[nova-api]', 'Package[neutron-common]', 'Package[python3-novaclient]', 'Package[python3-glanceclient]', 'Package[python3-keystoneauth1]', 'Package[python3-keystoneclient]', 'Package[python3-openstackclient]', 'Package[python3-troveclient]', 'Package[python3-designateclient]', 'Package[python3-neutronclient]', 'Package[python3-osc-placement]', 'Package[python3-tenacity]', 'Package[patch]', 'Package[neutron-api]', 'Package[neutron-server]', 'Package[octavia-api]', 'Package[octavia-health-manager]', 'Package[octavia-housekeeping]', 'Package[octavia-worker]', 'Package[python3-octavia]', 'Package[python3-octaviaclient]', 'Package[ldap-utils]', 'Package[memcached]', 'Package[liburi-perl]', 'Package[mariadb-server]', 'Package[mariadb-backup]', 'Package[galera-4]', 'Package[barbican-api]', 'Package[ruby-concurrent]', 'Package[ruby]', 'Package[libruby]', 'Package[puppet-agent]', 'Package[prometheus-rsyslog-exporter]', 'Package[initramfs-tools]', 'Package[python3-click]', 'Package[python3-box]', 'Package[confd]', 'Package[python3-toml]', 'Package[vlan]', 'Package[prometheus-openstack-exporter]', 'Package[rsync]', 'Package[prometheus-memcached-exporter]', 'Package[tofu]', 'Package[prometheus-mysqld-exporter]', 'Package[bacula-fd]', 'Package[bacula-common]']
+ 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[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[starship]', 'Package[ruby-sorted-set]', 'Package[btop]', 'Package[linux-sysctl-defaults]', '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[atop]', 'Package[apt-listchanges]', 'Package[isc-dhcp-client]', 'Package[rasdaemon]', 'Package[openssh-client]', 'Package[openssh-server]', 'Package[debdeploy-client]', 'Package[python3-dateutil]', 'Package[sudo]', 'Package[golang-cfssl]', 'Package[debmonitor-client]', 'Package[perccli]', '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[ulogd2]', 'Package[conntrack]', 'Package[libapache2-mod-auth-openidc]', 'Package[apache2]', 'Package[links]', 'Package[keystone]', 'Package[alembic]', 'Package[ldapvi]', 'Package[python3-ldappool]', 'Package[python3-ldap3]', 'Package[ruby-net-ldap]', 'Package[python3-mwclient]', 'Package[libvirt-clients]', 'Package[python3-pytest]', 'Package[glance]', 'Package[placement-api]', 'Package[cinder-api]', 'Package[cinder-scheduler]', 'Package[cinder-volume]', 'Package[tgt]', 'Package[python3-trove]', 'Package[trove-common]', 'Package[trove-api]', 'Package[trove-taskmanager]', 'Package[trove-conductor]', 'Package[python3-sqlalchemy]', 'Package[designate-sink]', 'Package[designate-common]', 'Package[designate-mdns]', 'Package[designate]', 'Package[designate-api]', 'Package[designate-doc]', 'Package[designate-central]', 'Package[python3-git]', 'Package[mcrouter]', 'Package[zookeeper]', 'Package[zookeeperd]', 'Package[radosgw]', 'Package[ceph-common]', 'Package[fio]', 'Package[heat-api]', 'Package[heat-api-cfn]', 'Package[heat-engine]', 'Package[magnum-api]', 'Package[magnum-conductor]', 'Package[python3-magnum-capi-helm]', 'Package[helm3]', 'Package[unzip]', 'Package[bridge-utils]', 'Package[nova-common]', 'Package[nova-conductor]', 'Package[nova-scheduler]', 'Package[nova-api]', 'Package[neutron-common]', 'Package[python3-novaclient]', 'Package[python3-glanceclient]', 'Package[python3-keystoneauth1]', 'Package[python3-keystoneclient]', 'Package[python3-openstackclient]', 'Package[python3-troveclient]', 'Package[python3-designateclient]', 'Package[python3-neutronclient]', 'Package[python3-osc-placement]', 'Package[python3-tenacity]', 'Package[patch]', 'Package[neutron-api]', 'Package[neutron-server]', 'Package[octavia-api]', 'Package[octavia-health-manager]', 'Package[octavia-housekeeping]', 'Package[octavia-worker]', 'Package[python3-octavia]', 'Package[python3-octaviaclient]', 'Package[ldap-utils]', 'Package[memcached]', 'Package[liburi-perl]', 'Package[mariadb-server]', 'Package[mariadb-backup]', 'Package[galera-4]', 'Package[barbican-api]', 'Package[ruby-concurrent]', 'Package[ruby]', 'Package[libruby]', 'Package[puppet-agent]', 'Package[prometheus-rsyslog-exporter]', 'Package[initramfs-tools]', 'Package[python3-click]', 'Package[python3-box]', 'Package[confd]', 'Package[python3-toml]', 'Package[vlan]', 'Package[prometheus-openstack-exporter]', 'Package[rsync]', 'Package[prometheus-jmx-exporter]', 'Package[openjdk-21-jdk]', 'Package[prometheus-memcached-exporter]', 'Package[tofu]', 'Package[prometheus-mysqld-exporter]', 'Package[bacula-fd]', 'Package[bacula-common]']
- Class[Zookeeper::Server]
- Parameters differences:
--- Class[Zookeeper::Server].orig
+++ Class[Zookeeper::Server]
+ cleanup_script_args => -n 10
+ cleanup_script => /usr/share/zookeeper/bin/zkCleanup.sh
+ default_template => profile/zookeeper/zookeeper.default.erb
+ enable_tls => False
+ log4j_template => profile/zookeeper/log4j.properties.erb
+ cleanup_timer_deploy => True
+ jmx_port => 9998
+ java_opts => -Xms1g -Xmx1g -javaagent:/usr/share/java/prometheus/jmx_prometheus_javaagent.jar=10.192.20.8:12181:/etc/prometheus/jvm_zookeeper_jmx_exporter.yaml
+ java_home => /usr/lib/jvm/java-21-openjdk-amd64
- Class[Profile::Openstack::Codfw1dev::Designate::Service]
- Parameters differences:
--- Class[Profile::Openstack::Codfw1dev::Designate::Service].orig
+++ Class[Profile::Openstack::Codfw1dev::Designate::Service]
+ zookeeper_clusters => {'designate_eqiad1': {'hosts': {'cloudcontrol2005-dev.codfw.wmnet': '2005', 'cloudcontrol2006-dev.codfw.wmnet': '2006', 'cloudcontrol2010-dev.codfw.wmnet': '2010'}}}
- Firewall::Service[zookeeper]