From 31bccb6cc4b6319b4c4a7e98412951a875c49995 Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Thu, 18 Dec 2014 16:05:46 -0600 Subject: [PATCH] When installing ceph-release log all install failures. This code used to make an exception for 'already installed' failures during a ceph-relase install and not log them. Unfortunately, this also caused all other types of errors to not log at all. With this change remote.run will log any errors that happen during the command. Signed-off-by: Andrew Schoen --- teuthology/task/install.py | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/teuthology/task/install.py b/teuthology/task/install.py index f07dbc347b..e0511246d9 100644 --- a/teuthology/task/install.py +++ b/teuthology/task/install.py @@ -437,17 +437,10 @@ def _update_rpm_package_list_and_install(ctx, remote, rpm, config): rpm_name = "{rpm_nm}.rpm".format(rpm_nm=ceph_release) base_url = "{start_of_url}/noarch/{rpm_name}".format( start_of_url=start_of_url, rpm_name=rpm_name) - err_mess = StringIO() - try: - # When this was one command with a pipe, it would sometimes - # fail with the message 'rpm: no packages given for install' - remote.run(args=['wget', base_url, ],) - remote.run(args=['sudo', 'rpm', '-i', rpm_name, ], stderr=err_mess, ) - except Exception: - cmp_msg = 'package {pkg} is already installed'.format( - pkg=ceph_release) - if cmp_msg != err_mess.getvalue().strip(): - raise + # When this was one command with a pipe, it would sometimes + # fail with the message 'rpm: no packages given for install' + remote.run(args=['wget', base_url, ],) + remote.run(args=['sudo', 'rpm', '-i', rpm_name, ],) remote.run(args=['rm', '-f', rpm_name]) -- 2.39.5