Bug 1545059

+++ This bug is a downstream clone. The original bug is: +++
+++   bug 1543526 +++
======================================================================

Description of problem:

This:

1. Install and setup rhv 4.1
2. Add current rhv 4.2 repo
3. yum update

currently fails with [1].

Above flow is not officially supported, we always say to update only setup packages. However, when we get bug reports about it breaking, we usually fix them, usually by adding relevant packages to versionlock.list.

The fix here is somewhat more delicate, because we renamed rhevm to rhvm and rhevm-branding-rhev to rhvm-branding-rhv.

Now verified that applying [2] to /etc fixes it. If we want to have this fix, we have to:
1. Open a bug on 4.1 to do [2] - to versionlock rhevm-branding-rhev and to add 'follow_obsoletes = 1' to versionlock.conf.
2. Make rhv 4.2 prevent upgrade to 4.2 from < 4.1.10

Then, people trying to upgrade from 4.1.9 to 4.2 should get a similar error message, but the fix will be more obvious - first upgrade to 4.1.10.

We never patched versionlock.conf, but I can't think of big potential problems doing so.

[1]
--> Finished Dependency Resolution
Error: Package: ovirt-engine-4.1.8.2-0.1.el7.noarch (@rhv-4.1.8)
           Requires: rhevm = 4.1.8.2-0.1.el7
           Removing: rhevm-4.1.8.2-0.1.el7.noarch (@rhv-4.1.8)
               rhevm = 4.1.8.2-0.1.el7
           Obsoleted By: rhvm-4.2.1.6-0.1.el7.noarch (rhv-4.2.1)
               rhevm = 4.2.1.6
Error: Package: ovirt-engine-backend-4.1.8.2-0.1.el7.noarch (@rhv-4.1.8)
           Requires: rhevm-branding-rhev >= 4.0.0
           Removing: rhevm-branding-rhev-4.1.8-1.el7ev.noarch (@rhv-4.1.8)
               rhevm-branding-rhev = 4.1.8-1.el7ev
           Obsoleted By: rhvm-branding-rhv-4.2.1-1.el7ev.noarch (rhv-4.2.1)
               Not found
           Available: rhevm-branding-rhev-4.1.0-2.el7ev.noarch (rhv-4.1.4)
               rhevm-branding-rhev = 4.1.0-2.el7ev
Error: Package: rhvm-4.2.1.6-0.1.el7.noarch (rhv-4.2.1)
           Requires: ovirt-engine = 4.2.1.6-0.1.el7
           Installed: ovirt-engine-4.1.8.2-0.1.el7.noarch (@rhv-4.1.8)
               ovirt-engine = 4.1.8.2-0.1.el7
 You could try using --skip-broken to work around the problem
 You could try running: rpm -Va --nofiles --nodigest

[2]
diff --git a/yum/pluginconf.d/versionlock.conf b/yum/pluginconf.d/versionlock.conf
index 4e997da..428aea6 100644
--- a/yum/pluginconf.d/versionlock.conf
+++ b/yum/pluginconf.d/versionlock.conf
@@ -2,4 +2,4 @@
 enabled = 1
 locklist = /etc/yum/pluginconf.d/versionlock.list
 #  Uncomment this to lock out "upgrade via. obsoletes" etc. (slower)
-# follow_obsoletes = 1
+follow_obsoletes = 1
diff --git a/yum/pluginconf.d/versionlock.list b/yum/pluginconf.d/versionlock.list
index 11470b0..dacf95c 100644
--- a/yum/pluginconf.d/versionlock.list
+++ b/yum/pluginconf.d/versionlock.list      
@@ -12,3 +12,4 @@ redhat-support-plugin-rhev-4.1.0-1.el7.noarch
 ovirt-engine-tools-4.1.8.2-0.1.el7.noarch
 ovirt-engine-extension-aaa-jdbc-1.1.6-1.el7ev.noarch
 ovirt-engine-userportal-4.1.8.2-0.1.el7.noarch
+rhevm-branding-rhev-4.1.8-1.el7ev.noarch

(Originally by didi)