fixed gswauth cmd tools to require admin key argument

All tools were changed to display the usage help text
in case the admin key is not provided as an argument

Bug 1261677: https://bugs.launchpad.net/gluster-swift/+bug/1261677

Change-Id: I37fa8518be970364b81955644931f6e416bcdc42
Signed-off-by: Thiago da Silva <thiago@redhat.com>
Reviewed-on: http://review.gluster.org/6553
Reviewed-by: Prashanth Pai <ppai@redhat.com>
Tested-by: Prashanth Pai <ppai@redhat.com>
Reviewed-by: pushpesh sharma <psharma@redhat.com>
Tested-by: pushpesh sharma <psharma@redhat.com>
Reviewed-by: Luis Pabon <lpabon@redhat.com>
Reviewed-on: http://review.gluster.org/6664
Tested-by: Luis Pabon <lpabon@redhat.com>

1 files changed, 3 insertions, 1 deletions

diff --git a/gluster/swift/common/middleware/gswauth/bin/gswauth-cleanup-tokens b/gluster/swift/common/middleware/gswauth/bin/gswauth-cleanup-tokens
index 621124e..cc2d18d 100755
--- a/gluster/swift/common/middleware/gswauth/bin/gswauth-cleanup-tokens
+++ b/gluster/swift/common/middleware/gswauth/bin/gswauth-cleanup-tokens
@@ -44,7 +44,7 @@ if __name__ == '__main__':
         default='http://127.0.0.1:8080/auth/', help='The URL to the auth '
         'subsystem (default: http://127.0.0.1:8080/auth/)')
     parser.add_option('-K', '--admin-key', dest='admin_key',
-        help='The key for .super_admin.')
+        help='The key for .super_admin is required.')
     parser.add_option('', '--purge', dest='purge_account', help='Purges all '
         'tokens for a given account whether the tokens have expired or not.')
     parser.add_option('', '--purge-all', dest='purge_all', action='store_true',
@@ -56,6 +56,8 @@ if __name__ == '__main__':
     (options, args) = parser.parse_args(args)
     if len(args) != 0:
         parser.parse_args(['-h'])
+    if options.admin_key is None:
+        parser.parse_args(['-h'])
     options.admin_url = options.admin_url.rstrip('/')
     if not options.admin_url.endswith('/v1.0'):
         options.admin_url += '/v1.0'