Closes-Bug: #1650463

Move the editing of /etc/yum/pluginconf.d/priorities.conf after yum-plugin- priorities package is installed Change-Id: I444bfc07c431f344a490c31bda567196a1d5062a
Juniper · Dec 16, 2016 · b540c36 · b540c36
1 parent 7efc4e0
commit b540c36
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/contrail/environment/modules/contrail/manifests/common.pp b/contrail/environment/modules/contrail/manifests/common.pp
@@ -128,7 +128,14 @@
             lens_to_use => 'properties.lns',
         } ->
         Sysctl::Value['kernel.core_pattern']
-        package { 'yum-plugin-priorities' : ensure => present,}
+        package { 'yum-plugin-priorities' : ensure => present,} ->
+        # add check_obsoletes flag off, for bug #1650463
+        exec { "/etc/yum/pluginconf.d/priorities.conf":
+            command => "echo 'check_obsoletes=1' >> /etc/yum/pluginconf.d/priorities.conf && echo exec-yum-priorities-fix >> /etc/contrail/exec-yum-pririties-fix.out",
+            provider => shell,
+            unless => "grep -qx exec-yum-priorities-fix /etc/contrail/exec-yum-pririties-fix.out",
+            logoutput => true
+        }
         contain ::contrail::disable_selinux
     }
 

diff --git a/contrail/environment/modules/contrail/manifests/lib/contrail_setup_repo.pp b/contrail/environment/modules/contrail/manifests/lib/contrail_setup_repo.pp
@@ -8,13 +8,6 @@
         file { "/etc/yum.repos.d/cobbler-config.repo" :
             ensure  => present,
             content => template("${module_name}/contrail-yum-repo.erb")
-        } ->
-        # add check_obsoletes flag off, for bug #1649596
-        exec { "/etc/yum/pluginconf.d/priorities.conf":
-            command => "echo 'check_obsoletes=1' >> /etc/yum/pluginconf.d/priorities.conf && echo exec-yum-priorities-fix >> /etc/contrail/exec-yum-pririties-fix.out",
-            provider => shell,
-            unless => "grep -qx exec-yum-priorities-fix /etc/contrail/exec-yum-pririties-fix.out",
-            logoutput => true
         }
     }
     if ($operatingsystem == "Ubuntu") {