From 2931f64a92341feb2f0ed35266dd8a16612e1ec6 Mon Sep 17 00:00:00 2001 From: Thiago da Silva Date: Thu, 19 Dec 2013 16:09:10 -0500 Subject: 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 Reviewed-on: http://review.gluster.org/6542 Reviewed-by: pushpesh sharma Tested-by: pushpesh sharma Reviewed-by: Prashanth Pai Tested-by: Prashanth Pai Reviewed-by: Chetan Risbud Reviewed-on: http://review.gluster.org/6660 Tested-by: Chetan Risbud --- gluster/swift/common/middleware/gswauth/bin/gswauth-add-account | 8 -------- gluster/swift/common/middleware/gswauth/bin/gswauth-add-user | 8 -------- 2 files changed, 16 deletions(-) (limited to 'gluster/swift/common/middleware/gswauth/bin') 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] ') - parser.add_option('-s', '--suffix', dest='suffix', - default='', help='The suffix to use with the reseller prefix as the ' - 'storage account name (default: ) 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: ) 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() -- cgit