From: Neha Ojha <nojha@redhat.com>
Date: Thu, 3 Jan 2019 21:39:30 +0000 (-0800)
Subject: qa/suites/upgrade/mimic-x: fix rhel runs
X-Git-Tag: v14.1.0~486^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a74129d26d834021e3500087b43dfa11a01cccf0;p=ceph-ci.git

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

The following fragment was required for rhel on ovh
overrides:
    ansible.cephlab:
      skip_tags: entitlements,packages,repos

Since, this suite runs on smithi in our nightlies, we should not need
this.

Signed-off-by: Neha Ojha <nojha@redhat.com>
---

diff --git a/qa/suites/upgrade/mimic-x/parallel/0-cluster/start.yaml b/qa/suites/upgrade/mimic-x/parallel/0-cluster/start.yaml
index 18390367420..07cd780ed32 100644
--- a/qa/suites/upgrade/mimic-x/parallel/0-cluster/start.yaml
+++ b/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
diff --git a/qa/suites/upgrade/mimic-x/stress-split/0-cluster/start.yaml b/qa/suites/upgrade/mimic-x/stress-split/0-cluster/start.yaml
index d71647f9273..94f9d0a5049 100644
--- a/qa/suites/upgrade/mimic-x/stress-split/0-cluster/start.yaml
+++ b/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