From 4034339118745e11fd6f58ab7b2bf84bbd5de022 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Mon, 11 Mar 2024 13:10:55 +0100 Subject: [PATCH 1/2] Revert "never install puppet 7.29.0 on EL" This reverts commit 245e2b0f19b73bd1a51efd5b2251ffbdb694eabd. --- roles/vagrant_workarounds/tasks/main.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/roles/vagrant_workarounds/tasks/main.yml b/roles/vagrant_workarounds/tasks/main.yml index d5c3624b1..875c9dec0 100644 --- a/roles/vagrant_workarounds/tasks/main.yml +++ b/roles/vagrant_workarounds/tasks/main.yml @@ -24,13 +24,3 @@ Pin-Priority: -10 when: - ansible_os_family == 'Debian' - -# workaround for https://github.com/puppetlabs/puppet/issues/9268 -- name: never install Puppet 7.29.0 on EL - community.general.ini_file: - path: /etc/dnf/dnf.conf - section: main - option: excludepkgs - value: 'puppet-agent-7.29.0*' - when: - - ansible_os_family == 'RedHat' From c57b26a4daf4313fa1adc208c672428b8d49fbfb Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Mon, 11 Mar 2024 13:10:57 +0100 Subject: [PATCH 2/2] Revert "never install puppet 7.29.0 on Debian" This reverts commit 1fa79172b8245db0a1814ae52af080a7bef9cf62. --- roles/vagrant_workarounds/tasks/main.yml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/roles/vagrant_workarounds/tasks/main.yml b/roles/vagrant_workarounds/tasks/main.yml index 875c9dec0..280e1e496 100644 --- a/roles/vagrant_workarounds/tasks/main.yml +++ b/roles/vagrant_workarounds/tasks/main.yml @@ -13,14 +13,3 @@ shell: rm -f /boot/*-generic.img when: - ansible_os_family == 'Debian' - -# workaround for https://github.com/puppetlabs/puppet/issues/9268 -- name: never install Puppet 7.29.0 on Debian - copy: - dest: /etc/apt/preferences.d/puppet.pref - content: | - Package: puppet-agent - Pin: version 7.29.0* - Pin-Priority: -10 - when: - - ansible_os_family == 'Debian'