Merge "Disablerepo is no more required for yum installations" into R3.1

Juniper · Mar 16, 2017 · 096b220 · 096b220
2 parents db274b6 + 382be3f
commit 096b220
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/contrail_provisioning/common/upgrade.py b/contrail_provisioning/common/upgrade.py
@@ -94,7 +94,7 @@ def _upgrade_package(self):
                 cmd += ' -o Dpkg::Options::="--force-confnew" install %s' % pkgs
         else:
             local('yum clean all')
-            cmd = 'yum -y --disablerepo=* --enablerepo=contrail*'
+            cmd = 'yum -y --nogpgcheck '
             cmd += ' install %s' % pkgs
         local(cmd)
 
@@ -140,8 +140,8 @@ def _downgrade_package(self):
             cmd += ' -o Dpkg::Options::="--force-confnew"'
             cmd += ' install %s' % pkgs
         else:
-            cmd = 'yum -y --nogpgcheck --disablerepo=*'
-            cmd += ' --enablerepo=contrail* install %s' % pkgs
+            cmd = 'yum -y --nogpgcheck '
+            cmd += ' install %s' % pkgs
         local(cmd)
 
     def _remove_package(self):
@@ -169,8 +169,8 @@ def _replace_package(self):
         else:
             with settings(warn_only = True):
                 local('rpm -e --nodeps %s' % rem_pkgs)
-            cmd = 'yum -y --nogpgcheck --disablerepo=*'
-            cmd += ' --enablerepo=contrail* install %s' % add_pkgs
+            cmd = 'yum -y --nogpgcheck '
+            cmd += ' install %s' % add_pkgs
             local(cmd)
 
     def _ensure_package(self):