From: Yuval Lifshitz <yuvalif@yahoo.com>
Date: Tue, 30 Apr 2019 08:51:16 +0000 (+0300)
Subject: rgw/pubsub: add another zone for pubsub
X-Git-Tag: v15.1.0~2764^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d8d817a6006e38b52f922b714870c32b9a76a169;p=ceph.git

rgw/pubsub: add another zone for pubsub

Signed-off-by: Yuval Lifshitz <yuvalif@yahoo.com>
---

diff --git a/qa/suites/rgw/multisite/realms/three-zone-plus-pubsub.yaml b/qa/suites/rgw/multisite/realms/three-zone-plus-pubsub.yaml
new file mode 100644
index 000000000000..e77e5ade409b
--- /dev/null
+++ b/qa/suites/rgw/multisite/realms/three-zone-plus-pubsub.yaml
@@ -0,0 +1,23 @@
+overrides:
+  rgw-multisite:
+    realm:
+      name: test-realm
+      is default: true
+    zonegroups:
+      - name: test-zonegroup
+        is_master: true
+        is_default: true
+        endpoints: [c1.client.0]
+        zones:
+          - name: test-zone1
+            is_master: true
+            is_default: true
+            endpoints: [c1.client.0]
+          - name: test-zone2
+            is_default: true
+            endpoints: [c2.client.0]
+          - name: test-zone3
+            endpoints: [c1.client.1]
+          - name: test-zone4
+            endpoints: [c2.client.1]
+            is_pubsub: true
diff --git a/qa/suites/rgw/multisite/realms/three-zone.yaml b/qa/suites/rgw/multisite/realms/three-zone.yaml
deleted file mode 100644
index 018ed55ff3c2..000000000000
--- a/qa/suites/rgw/multisite/realms/three-zone.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-overrides:
-  rgw-multisite:
-    realm:
-      name: test-realm
-      is default: true
-    zonegroups:
-      - name: test-zonegroup
-        is_master: true
-        is_default: true
-        endpoints: [c1.client.0]
-        zones:
-          - name: test-zone1
-            is_master: true
-            is_default: true
-            endpoints: [c1.client.0]
-          - name: test-zone2
-            is_default: true
-            endpoints: [c2.client.0]
-          - name: test-zone3
-            endpoints: [c1.client.1]
-            is_pubsub: true