add multi-region tests

Signed-off-by: Joe Buck <jbbuck@gmail.com>

diff --git a/clusters/fixed-2.yaml b/clusters/fixed-2.yaml
index 6298ff23c553cc0ca308cf33b48094ae4a37f6df..79ed8cb5e21fec8c186a7ae4327581c0da8c84cf 100644 (file)
--- a/clusters/fixed-2.yaml
+++ b/clusters/fixed-2.yaml
@@ -1,3 +1,3 @@
 roles:
-- [mon.a, mon.c, osd.0, osd.1, osd.2]
-- [mon.b, mds.a, osd.3, osd.4, osd.5, client.0]
+- [mon.a, mon.c, osd.0, osd.1, osd.2, client.0]
+- [mon.b, mds.a, osd.3, osd.4, osd.5, client.1]

diff --git a/suites/rgw/singleton/all/radosgw-admin-multi-region.yaml b/suites/rgw/singleton/all/radosgw-admin-multi-region.yaml
new file mode 100644 (file)
index 0000000..b01fb8e
--- /dev/null
+++ b/suites/rgw/singleton/all/radosgw-admin-multi-region.yaml
@@ -0,0 +1,60 @@
+roles:
+- [mon.a, mds.a, osd.0, osd.1, client.0]
+- [mon.b, mon.c, osd.2, osd.3, client.1]
+tasks:
+- install: 
+- ceph:
+    conf:
+      client:
+        debug ms: 1
+        rgw gc obj min wait: 15
+      osd:
+        debug ms: 1
+        debug objclass : 20
+      client.0: 
+        rgw region: region0
+        rgw zone: r0z1
+        rgw region root pool: .rgw.region.0
+        rgw zone root pool: .rgw.zone.0
+        rgw gc pool: .rgw.gc.0
+        rgw user uid pool: .users.uid.0
+        rgw user keys pool: .users.0
+        rgw log data: True
+        rgw log meta: True
+      client.1: 
+        rgw region: region1
+        rgw zone: r1z1
+        rgw region root pool: .rgw.region.1
+        rgw zone root pool: .rgw.zone.1
+        rgw gc pool: .rgw.gc.1
+        rgw user uid pool: .users.uid.1
+        rgw user keys pool: .users.1
+        rgw log data: False
+        rgw log meta: False
+- rgw:
+    regions:
+      region0:
+        api name: api1
+        is master: True
+        master zone: r0z1
+        zones: [r0z1]
+      region1:
+        api name: api1
+        is master: False
+        master zone: r1z1
+        zones: [r1z1]
+    client.0:
+      system user:
+        name: client0-system-user
+        access key: 0te6NH5mcdcq0Tc5i8i2
+        secret key: Oy4IOauQoL18Gp2zM7lC1vLmoawgqcYPbYGcWfXv
+    client.1:
+      system user:
+        name: client1-system-user
+        access key: 1te6NH5mcdcq0Tc5i8i3
+        secret key: Py4IOauQoL18Gp2zM7lC1vLmoawgqcYPbYGcWfXw
+- radosgw-agent:
+    client.0:
+      src: client.0
+      dest: client.1
+- radosgw-admin:

diff --git a/suites/rgw/singleton/all/radosgw-convert-to-region.yaml b/suites/rgw/singleton/all/radosgw-convert-to-region.yaml
new file mode 100644 (file)
index 0000000..6dd9364
--- /dev/null
+++ b/suites/rgw/singleton/all/radosgw-convert-to-region.yaml
@@ -0,0 +1,66 @@
+overrides:
+  s3readwrite:
+    s3:
+      user_id: s3readwrite-test-user
+      display_name: test user for the s3readwrite tests
+      email: tester@inktank
+      access_key: 2te6NH5mcdcq0Tc5i8i4
+      secret_key: Qy4IOauQoL18Gp2zM7lC1vLmoawgqcYPbYGcWfXx
+    readwrite:
+      deterministic_file_names: True
+      duration: 30
+      bucket: testbucket
+      files:
+        num: 10
+        size: 2000
+        stddev: 500
+roles:
+- [mon.a, mds.a, osd.0, osd.1, client.0]
+- [mon.b, mon.c, osd.2, osd.3, client.1]
+
+tasks:
+- install:
+- ceph:
+    conf:
+        client.1: 
+          rgw region: default
+          rgw zone: r1z1
+          rgw region root pool: .rgw
+          rgw zone root pool: .rgw
+          rgw gc pool: .rgw.gc
+          rgw user uid pool: .users.uid
+          rgw user keys pool: .users
+- rgw:
+    client.0:
+      system user:
+        name: nr-system
+        access key: 0te6NH5mcdcq0Tc5i8i2
+        secret key: Oy4IOauQoL18Gp2zM7lC1vLmoawgqcYPbYGcWfXv
+- s3readwrite:
+    client.0:
+      extra_args: ['--no-cleanup']
+      s3:
+        delete_user: False
+      readwrite:
+        writers: 1
+        readers: 0
+- rgw:
+    regions:
+      default:
+        api name: api1
+        is master: true
+        master zone: r1z1
+        zones: [r1z1]
+    client.1:
+      system user:
+        name: r2-system
+        access key: 1te6NH5mcdcq0Tc5i8i3
+        secret key: Py4IOauQoL18Gp2zM7lC1vLmoawgqcYPbYGcWfXw
+- s3readwrite:
+    client.1:
+      s3:
+        create_user: False
+      readwrite:
+        writers: 0
+        readers: 2
+