Merge "Partial-Bug: #1649596 The contrail-openstack package installat…

…ion is failing due to python2-cryptography present in the upstream base repo. That package obsoletes the python-cryptography which is what contrial package provides. Disable the obsolete check so that higher priority repo package is installed. contrail repo is higher priority. Leaving bug partial as this need to be fixed in fab as well." into R3.2

contrail/environment/modules/contrail/manifests/lib/contrail_setup_repo.pp

@@ -8,6 +8,13 @@
         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") {