Merge pull request #25781 from neha-ojha/wip-fix-upgrade-rhel

qa/suites/upgrade/mimic-x: fix rhel runs

Reviewed-by: Yuri Weinstein <yweins@redhat.com>

qa/suites/upgrade/mimic-x/parallel/0-cluster/start.yaml

@@ -4,6 +4,9 @@ meta:
    with a separate client 0,1,2 third node.
    Use xfs beneath the osds.
    CephFS tests running on client 2,3
+   #Note-To enable RHEL runs on ovh nodes, add the following to overrides
+   #ansible.cephlab:
+   # skip_tags: entitlements,packages,repos
 roles:
 - - mon.a
   - mgr.x
@@ -38,6 +41,3 @@ overrides:
         osd_class_default_list: "cephfs hello journal lock log numops rbd refcount 
                                  rgw sdk timeindex user version"
     fs: xfs
-  #enable RHEL runs on ovh nodes
-  ansible.cephlab:
-    skip_tags: entitlements,packages,repos

qa/suites/upgrade/mimic-x/stress-split/0-cluster/start.yaml

@@ -3,6 +3,9 @@ meta:
    Run ceph on two nodes,
    with a separate client-only node.
    Use xfs beneath the osds.
+   #Note-To enable RHEL runs on ovh nodes, add the following to overrides
+   #ansible.cephlab:
+   # skip_tags: entitlements,packages,repos
 overrides:
   ceph:
     fs: xfs
@@ -15,9 +18,6 @@ overrides:
         enable experimental unrecoverable data corrupting features: "*"
       mon:
         mon warn on osd down out interval zero: false
-  #enable RHEL runs on ovh nodes
-  ansible.cephlab:
-    skip_tags: entitlements,packages,repos
 roles:
 - - mon.a
   - mon.b