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
Juniper · Apr 1, 2016 · 8922789 · 8922789
1 parent c477e92
commit 8922789
Showing 1 changed file with 11 additions and 3 deletions.
diff --git 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*'