X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=tasks%2Finit.rb;h=86367d939629d02686d88297012026f491ff86fa;hb=23637e2ab8dae75b76d328fa8be2da09fd0dfc44;hp=237da9b0b66c60a1e03aa855f5edb2a2268d4f8a;hpb=97f697047dbd951a0b0f98dfea587f091464c68c;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/tasks/init.rb b/tasks/init.rb
index 237da9b..86367d9 100755
--- a/tasks/init.rb
+++ b/tasks/init.rb
@@ -8,7 +8,13 @@ require 'puppet'
 def apt_get(action)
   cmd = ['apt-get', action]
   cmd << '-y' if ['upgrade', 'dist-upgrade', 'autoremove'].include?(action)
-  ENV['DEBIAN_FRONTEND'] = 'noninteractive' if ['upgrade', 'dist-upgrade'].include?(action)
+  if ['upgrade', 'dist-upgrade'].include?(action)
+    ENV['DEBIAN_FRONTEND'] = 'noninteractive'
+    cmd << '-o'
+    cmd << 'Dpkg::Options="--force-confdef"'
+    cmd << '-o'
+    cmd << 'Dpkg::Options="--force-confold"'
+  end
   stdout, stderr, status = Open3.capture3(*cmd)
   raise Puppet::Error, stderr if status != 0
   { status: stdout.strip }