From d094bfa14433c245e40e0a88ff6872a67feac205 Mon Sep 17 00:00:00 2001 From: Raj Reddy Date: Thu, 31 Mar 2016 18:40:00 -0700 Subject: [PATCH] We are adding --confmiss option to apt-get, so that the conf files from packages will get installed even if they are missing/removed. Change-Id: I65c671a5289f36cc11e450924404a43ddc8032ae Closes-Bug: #1564223 (cherry picked from commit 892278925f5d344d0d0912685a70e83b84cd926a) --- contrail_provisioning/common/upgrade.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/contrail_provisioning/common/upgrade.py b/contrail_provisioning/common/upgrade.py index af6f455f..461e6116 100644 --- a/contrail_provisioning/common/upgrade.py +++ b/contrail_provisioning/common/upgrade.py @@ -81,9 +81,17 @@ def _upgrade_package(self): return pkgs = ' '.join(self.upgrade_data['upgrade']) if self.pdist in ['Ubuntu']: - cmd = 'DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes' - cmd += ' -o Dpkg::Options::="--force-overwrite"' - cmd += ' -o Dpkg::Options::="--force-confnew" install %s' % pkgs + if (self._args.from_rel >= LooseVersion('2.20') and + self._args.from_rel < LooseVersion('3.00') and + self._args.to_rel >= LooseVersion('3.00')): + cmd = 'DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes' + cmd += ' -o Dpkg::Options::="--force-overwrite"' + cmd += ' -o Dpkg::Options::="--force-confmiss"' + cmd += ' -o Dpkg::Options::="--force-confnew" install %s' % pkgs + else: + cmd = 'DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes' + cmd += ' -o Dpkg::Options::="--force-overwrite"' + cmd += ' -o Dpkg::Options::="--force-confnew" install %s' % pkgs else: local('yum clean all') cmd = 'yum -y --disablerepo=* --enablerepo=contrail*'