From 572f74555edcddb1b519d0ab1467f30cccfe6d27 Mon Sep 17 00:00:00 2001 From: Ben Vincent Date: Sun, 30 Mar 2025 00:39:03 +1100 Subject: [PATCH] feat: update all modules - update puppetlabs-* modules - update puppet-* modules - add limits and sysctl --- Puppetfile | 77 +++++++++++++++++---------------- hieradata/common.yaml | 8 ++++ site/profiles/manifests/base.pp | 4 ++ 3 files changed, 51 insertions(+), 38 deletions(-) diff --git a/Puppetfile b/Puppetfile index 7532e88..d38a073 100644 --- a/Puppetfile +++ b/Puppetfile @@ -2,54 +2,54 @@ forge 'forge.puppetlabs.com' moduledir 'external_modules' # puppetlabs -mod 'puppetlabs-stdlib', '9.1.0' -mod 'puppetlabs-inifile', '6.0.0' -mod 'puppetlabs-concat', '9.0.0' -mod 'puppetlabs-vcsrepo', '6.1.0' -mod 'puppetlabs-yumrepo_core', '2.0.0' -mod 'puppetlabs-apt', '9.4.0' -mod 'puppetlabs-lvm', '2.1.0' -mod 'puppetlabs-puppetdb', '7.13.0' -mod 'puppetlabs-postgresql', '9.1.0' -mod 'puppetlabs-firewall', '6.0.0' -mod 'puppetlabs-accounts', '8.1.0' -mod 'puppetlabs-mysql', '15.0.0' +mod 'puppetlabs-stdlib', '9.7.0' +mod 'puppetlabs-inifile', '6.2.0' +mod 'puppetlabs-concat', '9.1.0' +mod 'puppetlabs-vcsrepo', '7.0.0' +mod 'puppetlabs-yumrepo_core', '2.1.0' +mod 'puppetlabs-apt', '10.0.1' +mod 'puppetlabs-lvm', '3.0.1' +mod 'puppetlabs-puppetdb', '8.1.0' +mod 'puppetlabs-postgresql', '10.5.0' +mod 'puppetlabs-firewall', '8.1.4' +mod 'puppetlabs-accounts', '8.2.2' +mod 'puppetlabs-mysql', '16.2.0' mod 'puppetlabs-xinetd', '3.4.1' -mod 'puppetlabs-haproxy', '8.0.0' -mod 'puppetlabs-java', '10.1.2' -mod 'puppetlabs-reboot', '5.0.0' -mod 'puppetlabs-docker', '10.0.1' -mod 'puppetlabs-zfs_core', '1.6.1' +mod 'puppetlabs-haproxy', '8.2.0' +mod 'puppetlabs-java', '11.1.0' +mod 'puppetlabs-reboot', '5.1.0' +mod 'puppetlabs-docker', '10.2.0' # puppet -mod 'puppet-python', '7.0.0' -mod 'puppet-systemd', '5.1.0' -mod 'puppet-yum', '7.0.0' -mod 'puppet-archive', '7.0.0' -mod 'puppet-chrony', '2.6.0' -mod 'puppet-puppetboard', '9.0.0' -mod 'puppet-nginx', '5.0.0' -mod 'puppet-selinux', '4.1.0' -mod 'puppet-prometheus', '13.4.0' -mod 'puppet-grafana', '13.1.0' -mod 'puppet-consul', '8.0.0' -mod 'puppet-vault', '4.1.0' +mod 'puppet-python', '7.4.0' +mod 'puppet-systemd', '8.1.0' +mod 'puppet-yum', '7.2.0' +mod 'puppet-archive', '7.1.0' +mod 'puppet-chrony', '3.0.0' +mod 'puppet-puppetboard', '11.0.0' +mod 'puppet-nginx', '6.0.1' +mod 'puppet-selinux', '5.0.0' +mod 'puppet-prometheus', '16.0.0' +mod 'puppet-grafana', '14.1.0' +mod 'puppet-consul', '9.1.0' +mod 'puppet-vault', '4.1.1' mod 'puppet-dhcp', '6.1.0' mod 'puppet-keepalived', '5.1.0' -mod 'puppet-extlib', '7.0.0' -mod 'puppet-network', '2.2.0' -mod 'puppet-kmod', '4.0.1' +mod 'puppet-extlib', '7.5.1' +mod 'puppet-network', '2.2.1' +mod 'puppet-kmod', '4.1.0' mod 'puppet-filemapper', '4.0.0' -mod 'puppet-letsencrypt', '11.0.0' -mod 'puppet-rundeck', '9.1.0' -mod 'puppet-redis', '11.0.0' +mod 'puppet-letsencrypt', '11.1.0' +mod 'puppet-rundeck', '9.2.0' +mod 'puppet-redis', '11.1.0' mod 'puppet-nodejs', '11.0.0' # other -mod 'ghoneycutt-puppet', '3.3.0' -mod 'saz-sudo', '8.0.0' -mod 'saz-ssh', '12.1.0' +mod 'saz-sudo', '9.0.2' +mod 'saz-ssh', '13.1.0' +mod 'saz-limits', '5.0.0' mod 'ghoneycutt-timezone', '4.0.0' +mod 'ghoneycutt-puppet', '3.3.0' mod 'dalen-puppetdbquery', '3.0.1' mod 'markt-galera', '3.1.0' mod 'kogitoapp-minio', '1.1.4' @@ -59,6 +59,7 @@ mod 'h0tw1r3-gitea', '3.2.0' mod 'rehan-mkdir', '2.0.0' mod 'tailoredautomation-patroni', '2.0.0' mod 'ssm-crypto_policies', '0.3.3' +mod 'thias-sysctl', '1.0.8' mod 'bind', :git => 'https://git.service.au-syd1.consul/unkinben/puppet-bind.git', diff --git a/hieradata/common.yaml b/hieradata/common.yaml index c1379c8..ece85d6 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -137,6 +137,12 @@ lookup_options: strategy: deep profiles::etcd::node::initial_cluster_token: convert_to: Sensitive + sysctl::base::values: + merge: + strategy: deep + limits::entries: + merge: + strategy: deep facts_path: '/opt/puppetlabs/facter/facts.d' @@ -145,6 +151,8 @@ hiera_include: - networking - ssh::server - profiles::accounts::rundeck + - limits + - sysctl::base profiles::ntp::client::ntp_role: 'roles::infra::ntp::server' profiles::ntp::client::use_ntp: 'region' diff --git a/site/profiles/manifests/base.pp b/site/profiles/manifests/base.pp index fd4188e..c1a4feb 100644 --- a/site/profiles/manifests/base.pp +++ b/site/profiles/manifests/base.pp @@ -56,6 +56,10 @@ class profiles::base ( include profiles::qemu::agent } + class { 'limits': + purge_limits_d_dir => false, + } + # include classes from hiera $hiera_include = lookup('hiera_include', Array[String], 'unique', []) $hiera_exclude = lookup('hiera_exclude', Array[String], 'unique', []) -- 2.47.3