Merge pull request #176 from ceph/fix_d-f-x_suite

Fixed upgrade steps flow

suites/upgrade/dumpling-firefly-x/parallel/3-upgrade-sequence/upgrade-all.yaml

@@ -2,5 +2,9 @@ upgrade-sequence0:
    sequential:
    - install.upgrade:
        mon.a:
+         branch: firefly
        mon.b:
+         branch: firefly
+   - print: "**** done install.upgrade firefly for mon.a and mon.b"
    - ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3]
+   - print: "**** done ceph.restart the cluster"

suites/upgrade/dumpling-firefly-x/parallel/4-firefly-upgrade/firefly.yaml

@@ -1,14 +1,4 @@
 tasks:
-   - install.upgrade:
-       mon.a:
-         branch: firefly
-       mon.b:
-         branch: firefly
-       client.0:
-         branch: firefly
-   - print: "**** done install.upgrade"
-   - ceph.restart:
-   - print: "**** done restart"
    - parallel:
      - workload2
      - upgrade-sequence