From d6d57aeb9cbaf096eaafdcbe74886ca90ac2e20c Mon Sep 17 00:00:00 2001 From: Orit Wasserman Date: Wed, 23 Sep 2015 11:42:10 +0200 Subject: [PATCH] rgw: use realm provided in the command line Signed-off-by: Orit Wasserman --- src/rgw/rgw_rados.cc | 4 ++++ src/rgw/rgw_rados.h | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index c35d210ed0fc3..4f1cbd4adb428 100644 --- a/src/rgw/rgw_rados.cc +++ b/src/rgw/rgw_rados.cc @@ -550,6 +550,10 @@ int RGWSystemMetaObj::store_info(bool exclusive) } +const string& RGWRealm::get_predefined_id() { + return cct->_conf->rgw_realm; +} + int RGWRealm::create() { diff --git a/src/rgw/rgw_rados.h b/src/rgw/rgw_rados.h index dd15c5bafc9c5..a00a5bcfc3978 100644 --- a/src/rgw/rgw_rados.h +++ b/src/rgw/rgw_rados.h @@ -1271,9 +1271,8 @@ public: const string& get_default_oid(bool old_format = false); const string& get_names_oid_prefix(); const string& get_info_oid_prefix(bool old_format = false); - const string& get_predefined_id() { - return id; - } + const string& get_predefined_id(); + void dump(Formatter *f) const; void decode_json(JSONObj *obj); -- 2.39.5