From: Yuri Weinstein <yweinste@redhat.com>
Date: Wed, 17 Feb 2016 17:50:00 +0000 (-0800)
Subject: Fixes #14652
X-Git-Tag: v0.94.10~27^2^2~41^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=0e6f6d89cb1e50bd564a42664439d1a77e75e2f0;p=ceph.git

Fixes #14652

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
---

diff --git a/suites/upgrade/hammer/newer/0-cluster/start.yaml b/suites/upgrade/hammer/newer/0-cluster/start.yaml
index c344edada4cc4..2f00028f52e9d 100644
--- a/suites/upgrade/hammer/newer/0-cluster/start.yaml
+++ b/suites/upgrade/hammer/newer/0-cluster/start.yaml
@@ -20,4 +20,5 @@ roles:
   - osd.4
   - osd.5
   - client.0
-  - client.1
+- - client.1
+  - client.2
diff --git a/suites/upgrade/hammer/newer/2-workload/rbd.yaml b/suites/upgrade/hammer/newer/2-workload/rbd.yaml
index 5960273bf4b89..d37b294e15d34 100644
--- a/suites/upgrade/hammer/newer/2-workload/rbd.yaml
+++ b/suites/upgrade/hammer/newer/2-workload/rbd.yaml
@@ -2,7 +2,7 @@ workload:
    sequential:
    - workunit:
        clients:
-         client.0:
+         client.1:
            - rbd/import_export.sh
        env:
          RBD_CREATE_ARGS: --new-format
diff --git a/suites/upgrade/hammer/newer/2-workload/s3tests.yaml b/suites/upgrade/hammer/newer/2-workload/s3tests.yaml
index 20f81d108a2eb..086346a9ace62 100644
--- a/suites/upgrade/hammer/newer/2-workload/s3tests.yaml
+++ b/suites/upgrade/hammer/newer/2-workload/s3tests.yaml
@@ -1,9 +1,9 @@
 workload:
   sequential:
-  - rgw: [client.0]
-  - print: "**** done rgw: [client.0] 2-workload"
+  - rgw: [client.1]
+  - print: "**** done rgw: [client.1] 2-workload"
   - s3tests:
-      client.0:
+      client.1:
         force-branch: hammer
-        rgw_server: client.0
+        rgw_server: client.1
   - print: "**** done s3tests 2-workload off hammer branch"
diff --git a/suites/upgrade/hammer/newer/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/hammer/newer/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
index b697e2c9580c6..f0c62fda007c1 100644
--- a/suites/upgrade/hammer/newer/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
+++ b/suites/upgrade/hammer/newer/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
@@ -1,7 +1,8 @@
 upgrade-sequence:
    sequential:
    - install.upgrade:
-      all:
+       mon.a:
+       mon.b:
    - print: "**** done install.upgrade hammer"
    - ceph.restart: [mon.a]
    - sleep:
diff --git a/suites/upgrade/hammer/newer/3-upgrade-sequence/upgrade-osd-mon-mds.yaml b/suites/upgrade/hammer/newer/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
index 0f773e4690867..e4df6c8a11102 100644
--- a/suites/upgrade/hammer/newer/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
+++ b/suites/upgrade/hammer/newer/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
@@ -1,7 +1,8 @@
 upgrade-sequence:
    sequential:
    - install.upgrade:
-      all:
+       mon.a:
+       mon.b:
    - print: "**** done install.upgrade hammer"
    - ceph.restart: [osd.0]
    - sleep:
diff --git a/suites/upgrade/hammer/newer/4-final/testrgw.yaml b/suites/upgrade/hammer/newer/4-final/testrgw.yaml
index 7b2c2c3b3327b..85689decb1c06 100644
--- a/suites/upgrade/hammer/newer/4-final/testrgw.yaml
+++ b/suites/upgrade/hammer/newer/4-final/testrgw.yaml
@@ -1,8 +1,9 @@
 tasks:
 - sequential:
-  - rgw: [client.1]
-  - print: "**** done rgw: [client.1] 4-workload"
+  - rgw: [client.2]
+  - print: "**** done rgw: [client.2] 4-workload"
   - s3tests:
-      client.1:
-         rgw_server: client.1
+      client.2:
+         force-branch: hammer
+         rgw_server: client.2
   - print: "**** done s3tests 4-workload"