diff options
author | Thiago da Silva <thiago@redhat.com> | 2013-12-19 16:09:10 -0500 |
---|---|---|
committer | Luis Pabon <lpabon@redhat.com> | 2014-01-06 18:03:34 -0800 |
commit | 277ce27bcbb09487ccae899ca85e28443d5ceef7 (patch) | |
tree | 9a650a3aea145b4dbffc11150162bc516baec97f /gluster/swift | |
parent | fe163dd6b8489d28b54e7335f65b8abf980e59a1 (diff) |
removing -s option from gswauth tools
the --suffix option is not currently supported in this version
of gswauth, so we are removing to not confuse users.
Bug 1262230: https://bugs.launchpad.net/gluster-swift/+bug/1262230
Change-Id: I12da2aad5929f619f838c217330bef503b7e0ba2
Signed-off-by: Thiago da Silva <thiago@redhat.com>
Reviewed-on: http://review.gluster.org/6542
Reviewed-by: pushpesh sharma <psharma@redhat.com>
Tested-by: pushpesh sharma <psharma@redhat.com>
Reviewed-by: Prashanth Pai <ppai@redhat.com>
Tested-by: Prashanth Pai <ppai@redhat.com>
Reviewed-by: Chetan Risbud <crisbud@redhat.com>
Diffstat (limited to 'gluster/swift')
-rwxr-xr-x | gluster/swift/common/middleware/gswauth/bin/gswauth-add-account | 8 | ||||
-rwxr-xr-x | gluster/swift/common/middleware/gswauth/bin/gswauth-add-user | 8 |
2 files changed, 0 insertions, 16 deletions
diff --git a/gluster/swift/common/middleware/gswauth/bin/gswauth-add-account b/gluster/swift/common/middleware/gswauth/bin/gswauth-add-account index 0f72f06..fcad757 100755 --- a/gluster/swift/common/middleware/gswauth/bin/gswauth-add-account +++ b/gluster/swift/common/middleware/gswauth/bin/gswauth-add-account @@ -26,12 +26,6 @@ from swift.common.utils import urlparse if __name__ == '__main__': gettext.install('gswauth', unicode=1) parser = OptionParser(usage='Usage: %prog [options] <account>') - parser.add_option('-s', '--suffix', dest='suffix', - default='', help='The suffix to use with the reseller prefix as the ' - 'storage account name (default: <randomly-generated-uuid4>) Note: If ' - 'the account already exists, this will have no effect on existing ' - 'service URLs. Those will need to be updated with ' - 'gswauth-set-account-service') parser.add_option('-A', '--admin-url', dest='admin_url', default='http://127.0.0.1:8080/auth/', help='The URL to the auth ' 'subsystem (default: http://127.0.0.1:8080/auth/)') @@ -60,8 +54,6 @@ if __name__ == '__main__': headers = {'X-Auth-Admin-User': options.admin_user, 'X-Auth-Admin-Key': options.admin_key, 'Content-Length': '0'} - if options.suffix: - headers['X-Account-Suffix'] = options.suffix conn = http_connect(parsed.hostname, parsed.port, 'PUT', path, headers, ssl=(parsed.scheme == 'https')) resp = conn.getresponse() diff --git a/gluster/swift/common/middleware/gswauth/bin/gswauth-add-user b/gluster/swift/common/middleware/gswauth/bin/gswauth-add-user index b9588ef..e32ea28 100755 --- a/gluster/swift/common/middleware/gswauth/bin/gswauth-add-user +++ b/gluster/swift/common/middleware/gswauth/bin/gswauth-add-user @@ -36,12 +36,6 @@ if __name__ == '__main__': 'administrator access, giving them full access to all accounts within ' 'the reseller, including the ability to create new accounts. Creating ' 'a new reseller admin requires super_admin rights.') - parser.add_option('-s', '--suffix', dest='suffix', - default='', help='The suffix to use with the reseller prefix as the ' - 'storage account name (default: <randomly-generated-uuid4>) Note: If ' - 'the account already exists, this will have no effect on existing ' - 'service URLs. Those will need to be updated with ' - 'gswauth-set-account-service') parser.add_option('-A', '--admin-url', dest='admin_url', default='http://127.0.0.1:8080/auth/', help='The URL to the auth ' 'subsystem (default: http://127.0.0.1:8080/auth/') @@ -70,8 +64,6 @@ if __name__ == '__main__': path = '%sv2/%s' % (parsed_path, account) headers = {'X-Auth-Admin-User': options.admin_user, 'X-Auth-Admin-Key': options.admin_key} - if options.suffix: - headers['X-Account-Suffix'] = options.suffix conn = http_connect(parsed.hostname, parsed.port, 'GET', path, headers, ssl=(parsed.scheme == 'https')) resp = conn.getresponse() |