diff options
| author | Yehuda Sadeh <yehuda@redhat.com> | 2015-10-15 17:36:41 +0200 |
|---|---|---|
| committer | Yehuda Sadeh <yehuda@redhat.com> | 2015-10-15 17:36:41 +0200 |
| commit | c55f8d4300019bf2da1fe52edb0c2151cc8e3d2e (patch) | |
| tree | ade6fd597601f2ed50385af0eaa4e9e1f64ea2a9 /src | |
| parent | Merge pull request #6281 from dachary/wip-releases (diff) | |
| parent | radosgw-admin: Create --secret-key alias for --secret (diff) | |
| download | ceph-c55f8d4300019bf2da1fe52edb0c2151cc8e3d2e.tar.xz ceph-c55f8d4300019bf2da1fe52edb0c2151cc8e3d2e.zip | |
Merge pull request #5335 from zhouyuan/radosgw_admin_secret_key_alias
radosgw-admin: Create --secret-key alias for --secret
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/rgw/rgw_admin.cc | 5 | ||||
| -rw-r--r-- | src/test/cli/radosgw-admin/help.t | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc index af82ecbbf77..6cab3e89cfd 100644 --- a/src/rgw/rgw_admin.cc +++ b/src/rgw/rgw_admin.cc @@ -118,7 +118,8 @@ void _usage() cout << " --subuser=<name> subuser name\n"; cout << " --access-key=<key> S3 access key\n"; cout << " --email=<email>\n"; - cout << " --secret=<key> specify secret key\n"; + cout << " --secret/--secret-key=<key>\n"; + cout << " specify secret key\n"; cout << " --gen-access-key generate random access key (for S3)\n"; cout << " --gen-secret generate random secret key\n"; cout << " --key-type=<type> key type, options are: swift, s3\n"; @@ -1180,7 +1181,7 @@ int main(int argc, char **argv) access_key = val; } else if (ceph_argparse_witharg(args, i, &val, "--subuser", (char*)NULL)) { subuser = val; - } else if (ceph_argparse_witharg(args, i, &val, "--secret", (char*)NULL)) { + } else if (ceph_argparse_witharg(args, i, &val, "--secret", "--secret-key", (char*)NULL)) { secret_key = val; } else if (ceph_argparse_witharg(args, i, &val, "-e", "--email", (char*)NULL)) { user_email = val; diff --git a/src/test/cli/radosgw-admin/help.t b/src/test/cli/radosgw-admin/help.t index 2ef95735e93..f6eb5bbd1a3 100644 --- a/src/test/cli/radosgw-admin/help.t +++ b/src/test/cli/radosgw-admin/help.t @@ -75,7 +75,8 @@ --subuser=<name> subuser name --access-key=<key> S3 access key --email=<email> - --secret=<key> specify secret key + --secret/--secret-key=<key> + specify secret key --gen-access-key generate random access key (for S3) --gen-secret generate random secret key --key-type=<type> key type, options are: swift, s3 |