From: Yuri Weinstein <yweinste@redhat.com>
Date: Wed, 11 Nov 2015 17:47:24 +0000 (-0800)
Subject: Added %
X-Git-Tag: v10.2.6~165^2^2~286^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=978d83d97d500e2c67f39f4796fce2b554e12079;p=ceph.git

Added %
Fixed intall.upgrade syntax
Whitelisted 'reached quota'

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

diff --git a/suites/upgrade/hammer-x/f-h-x-offline/% b/suites/upgrade/hammer-x/f-h-x-offline/%
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/suites/upgrade/hammer-x/f-h-x-offline/0-install.yaml b/suites/upgrade/hammer-x/f-h-x-offline/0-install.yaml
index 35711bf78425..ab5cd4b299ed 100644
--- a/suites/upgrade/hammer-x/f-h-x-offline/0-install.yaml
+++ b/suites/upgrade/hammer-x/f-h-x-offline/0-install.yaml
@@ -4,3 +4,5 @@ tasks:
 - install:
     branch: firefly
 - ceph:
+    log-whitelist:
+    - reached quota
diff --git a/suites/upgrade/hammer-x/f-h-x-offline/2-upgrade.yaml b/suites/upgrade/hammer-x/f-h-x-offline/2-upgrade.yaml
index 11d923e2d0eb..6688e7d4600d 100644
--- a/suites/upgrade/hammer-x/f-h-x-offline/2-upgrade.yaml
+++ b/suites/upgrade/hammer-x/f-h-x-offline/2-upgrade.yaml
@@ -1,5 +1,6 @@
 tasks:
 - install.upgrade:
+    mon.a:
 - ceph.restart: [mon.a, mon.b, mon.c]
 - ceph.stop: [osd.0, osd.1, osd.2]
 - exec: