summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcaleb miles <caselim@gmail.com>2013-04-10 15:00:06 -0400
committercaleb miles <caselim@gmail.com>2013-04-10 15:46:57 -0400
commit49bc341f075bf29822d0cf760c70926b98dfd2a3 (patch)
treef1503bb4489d47e50cdf8be19f247da055f18edd
parent1ef0ecfcb40970641784c1ba214dd5a72ff6d5e3 (diff)
downloadceph-49bc341f075bf29822d0cf760c70926b98dfd2a3.tar.gz
rgw_admin: Create keys for a new user by default.
Create a new key pair for new users or when --gen-access-key is specified. Signed-off-by: caleb miles <caleb.miles@inktank.com>
-rw-r--r--src/rgw/rgw_admin.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index 01a28b5af76..9804761e8ab 100644
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -666,10 +666,10 @@ int main(int argc, char **argv)
user_op.set_purge_keys();
if (gen_access_key)
- user_op.set_gen_access();
+ user_op.set_generate_key();
if (gen_secret_key)
- user_op.set_gen_secret();
+ user_op.set_gen_secret(); // assume that a key pair should be created
if (max_buckets >= 0)
user_op.set_max_buckets(max_buckets);
@@ -712,6 +712,7 @@ int main(int argc, char **argv)
case OPT_USER_INFO:
break;
case OPT_USER_CREATE:
+ user_op.set_generate_key(); // generate a new key by default
ret = user.add(user_op, &err_msg);
if (ret < 0) {
cerr << "could not create user: " << err_msg << std::endl;