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.. Change-Id: I00d78d2a4299a8efd37cab143b937027bd76ee4e
Juniper · May 20, 2016 · 0d9e462 · 0d9e462
1 parent cf689fb
commit 0d9e462
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/contrail_provisioning/common/upgrade.py b/contrail_provisioning/common/upgrade.py
@@ -161,13 +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']:
-            with settings(warn_only=True):
+            with settings(warn_only = True):
                 local('DEBIAN_FRONTEND=noninteractive apt-get -y remove --purge\
-                      %s' % rem_pkgs)
+                       %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)