From 70f6d104db0d03ca56198aa864f837d4b79fd4d3 Mon Sep 17 00:00:00 2001 From: Raj Reddy Date: Fri, 20 May 2016 11:25:15 -0700 Subject: [PATCH] Closes-Bug: #1584154 make the upgrade_contrail re-entrant by ignoring error of removal of packages, as those would have been removed in earlier runs.. (cherry picked from commit 0d9e4627628db8e7ffbcc69241088b2c67d7c321) Conflicts: contrail_provisioning/common/upgrade.py Change-Id: I00d78d2a4299a8efd37cab143b937027bd76ee4e --- contrail_provisioning/common/upgrade.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/contrail_provisioning/common/upgrade.py b/contrail_provisioning/common/upgrade.py index 461e6116..36f67d00 100644 --- a/contrail_provisioning/common/upgrade.py +++ b/contrail_provisioning/common/upgrade.py @@ -9,7 +9,7 @@ import argparse import stat from distutils.version import LooseVersion - +from fabric.api import settings from fabric.api import local class ContrailUpgrade(object): @@ -161,12 +161,14 @@ def _replace_package(self): rem_pkgs = ' '.join([x for (x,y) in self.upgrade_data['replace']]) add_pkgs = ' '.join([y for (x,y) in self.upgrade_data['replace']]) if self.pdist in ['Ubuntu']: - local('DEBIAN_FRONTEND=noninteractive apt-get -y remove --purge\ - %s' % rem_pkgs) + with settings(warn_only = True): + local('DEBIAN_FRONTEND=noninteractive apt-get -y remove --purge\ + %s' % rem_pkgs) local('DEBIAN_FRONTEND=noninteractive apt-get -y install --reinstall\ %s' % add_pkgs) else: - local('rpm -e --nodeps %s' % rem_pkgs) + with settings(warn_only = True): + local('rpm -e --nodeps %s' % rem_pkgs) cmd = 'yum -y --nogpgcheck --disablerepo=*' cmd += ' --enablerepo=contrail* install %s' % add_pkgs local(cmd)