From: Yehuda Sadeh <yehuda@redhat.com>
Date: Tue, 13 Jan 2015 21:53:40 +0000 (-0800)
Subject: rgw: set default region and zone to all clients
X-Git-Tag: v0.94.10~27^2^2~187^2~2^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=adc9bdae34a69b6371e9f7a816a6f5cb3f675f83;p=ceph.git

rgw: set default region and zone to all clients

Otherwise it's going to use zone 'default' for client.0, not as expected. Also
add region configuration to task.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
---

diff --git a/suites/rgw/singleton/all/radosgw-convert-to-region.yaml b/suites/rgw/singleton/all/radosgw-convert-to-region.yaml
index 2cf690c79da3..292a1d2ae01b 100644
--- a/suites/rgw/singleton/all/radosgw-convert-to-region.yaml
+++ b/suites/rgw/singleton/all/radosgw-convert-to-region.yaml
@@ -22,7 +22,7 @@ tasks:
 - install:
 - ceph:
     conf:
-        client.1: 
+        client:
           rgw region: default
           rgw zone: r1z1
           rgw region root pool: .rgw
@@ -32,6 +32,12 @@ tasks:
           rgw user uid pool: .users.uid
           rgw user keys pool: .users
 - rgw:
+    regions:
+      default:
+        api name: api1
+        is master: true
+        master zone: r1z1
+        zones: [r1z1]
     client.0:
       system user:
         name: nr-system