From 9293aba51ffb0aebc5a37280c19bbf9bd1ca9d28 Mon Sep 17 00:00:00 2001 From: ts Date: Fri, 15 Feb 2019 17:25:26 +0000 Subject: [PATCH] utilities/apt_upgrade: hold puppet-agent to prevent breaking on oVirt --- modules/utilities/unix/update/apt_upgrade/manifests/apt.pp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/utilities/unix/update/apt_upgrade/manifests/apt.pp b/modules/utilities/unix/update/apt_upgrade/manifests/apt.pp index 281d9a353..e1417a85e 100644 --- a/modules/utilities/unix/update/apt_upgrade/manifests/apt.pp +++ b/modules/utilities/unix/update/apt_upgrade/manifests/apt.pp @@ -7,12 +7,17 @@ class apt_upgrade::apt { } else { case $operatingsystem { 'Debian': { + # can't upgrade puppet agent mid-provision or it breaks on oVirt. + exec { 'hold puppet-agent': + command => '/usr/bin/apt hold puppet-agent' + } exec { 'update': command => "/usr/bin/apt-get -y upgrade", tries => 5, try_sleep => 30, timeout => 0, logoutput => true, + require => Exec['hold puppet agent'], } } 'Ubuntu': {