Merge branch 'develop' into neoloc/mariadbgalera

hieradata/common.yaml

@@ -1,4 +1,12 @@
 ---
+lookup_options:
+  profiles::packages::base::add:
+    merge:
+      strategy: deep
+  profiles::packages::base::remove:
+    merge:
+      strategy: deep
+
 profiles::ntp::client::ntp_role: 'roles::infra::ntp::server'
 profiles::ntp::client::peers:
   - 0.pool.ntp.org
@@ -12,24 +20,55 @@ profiles::base::puppet_servers:
 profiles::dns::master::basedir: '/var/named/sources'
 profiles::dns::base::ns_role: 'roles::infra::dns::resolver'
 
-profiles::packages::base:
+profiles::packages::base::add:
   - bash-completion
+  - bzip2
   - ccze
   - curl
   - dstat
+  - gzip
   - htop
+  - inotify-tools
+  - iotop
+  - jq
+  - lz4
+  - lzo
   - mtr
   - ncdu
   - neovim
+  - p7zip
+  - pbzip2
+  - pigz
+  - pv
   - rsync
   - screen
+  - socat
   - strace
+  - sysstat
   - tmux
+  - traceroute
   - vim
   - vnstat
   - wget
+  - xz
   - zsh
-  - socat
+  - zstd
+
+profiles::packages::base::remove:
+  - iwl100-firmware
+  - iwl1000-firmware
+  - iwl105-firmware
+  - iwl135-firmware
+  - iwl2000-firmware
+  - iwl2030-firmware
+  - iwl3160-firmware
+  - iwl5000-firmware
+  - iwl5150-firmware
+  - iwl6000-firmware
+  - iwl6000g2a-firmware
+  - iwl6050-firmware
+  - iwl7260-firmware
+  - puppet7-release
 
 profiles::base::scripts::scripts:
   puppet: puppetwrapper.py