From: Dan Mick <dan.mick@inktank.com>
Date: Fri, 12 Apr 2013 17:56:14 +0000 (-0700)
Subject: Revert "Install.py: Prevent prompts from breaking apt"
X-Git-Tag: 1.1.0~2177^2~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=67a616a97927efdc4fbcc5edb0d0cf4a724d90e2;p=teuthology.git

Revert "Install.py: Prevent prompts from breaking apt"

This reverts commit 5995ae7e78dd19f4036f891db9db9fec97d6eab5.

With the changes to ceph-qa-chef and the teuthology kernel task,
we're no longer touching packaged file /etc/grub.d/10_linux, which
was the reason for this apt forcing.  Remove so that we find other
package problems that might be masked by this; we can always
put it back if there are such problems until we can fix those as well.

Signed-off-by: Dan Mick <dan.mick@inktank.com>
(cherry picked from commit c2b0828b19a426c6d73cb2f614333200ae66bac3)
---

diff --git a/teuthology/task/install.py b/teuthology/task/install.py
index 4255bb09c..aa98fc2be 100644
--- a/teuthology/task/install.py
+++ b/teuthology/task/install.py
@@ -130,8 +130,7 @@ def _update_deb_package_list_and_install(ctx, remote, debs, config):
     remote.run(
         args=[
             'sudo', 'apt-get', 'update', run.Raw('&&'),
-            'sudo', 'DEBIAN_FRONTEND=noninteractive', 'apt-get', '-y', '--force-yes',
-            '-o', run.Raw('Dpkg::Options::="--force-confdef"'), '-o', run.Raw('Dpkg::Options::="--force-confold"'),
+            'sudo', 'apt-get', '-y', '--force-yes',
             'install',
             ] + ['%s=%s' % (d, version) for d in debs],
         stdout=StringIO(),
@@ -213,8 +212,7 @@ def _remove_deb(remote, debs):
             ] + debs + [
             run.Raw(';'),
             'do',
-            'sudo', 'DEBIAN_FRONTEND=noninteractive', 'apt-get', '-y', '--force-yes',
-            '-o', run.Raw('Dpkg::Options::="--force-confdef"'), '-o', run.Raw('Dpkg::Options::="--force-confold"'), 'purge',
+            'sudo', 'apt-get', '-y', '--force-yes', 'purge',
             run.Raw('$d'),
             run.Raw('||'),
             'true',
@@ -237,8 +235,7 @@ def _remove_deb(remote, debs):
     # then let apt clean up
     remote.run(
         args=[
-            'sudo', 'DEBIAN_FRONTEND=noninteractive', 'apt-get', '-y', '--force-yes',
-            '-o', run.Raw('Dpkg::Options::="--force-confdef"'), '-o', run.Raw('Dpkg::Options::="--force-confold"'),
+            'sudo', 'apt-get', '-y', '--force-yes',
             'autoremove',
             ],
         stdout=StringIO(),
@@ -471,8 +468,7 @@ def _upgrade_ceph_packages(ctx, remote, debs, ceph_branch):
     remote.run(
         args=[
             'sudo', 'apt-get', 'update', run.Raw('&&'),
-            'sudo', 'DEBIAN_FRONTEND=noninteractive', 'apt-get', '-y', '--force-yes', 
-            '-o', run.Raw('Dpkg::Options::="--force-confdef"'), '-o', run.Raw('Dpkg::Options::="--force-confold"'),
+            'sudo', 'apt-get', '-y', '--force-yes',
             'upgrade',
             ] + ['%s=%s' % (d, version) for d in debs],
         stdout=StringIO(),