RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-24 11:37:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 5995ae7e78.

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 c2b0828b19)
This commit is contained in:
Dan Mick 2013-04-12 10:56:14 -07:00 committed by Sam Lang
parent df3d70fd62
commit 1b65b8fe1a
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
teuthology/task/install.py
View File

@ -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(),