diff --git a/account_manager.py b/account_manager.py index 52b74752a2b5915732a755901fa2ed47ea7e8de9..a4b701725f12ae4c1449088d8283ac4455cee404 100755 --- a/account_manager.py +++ b/account_manager.py @@ -14,7 +14,7 @@ parser = argparse.ArgumentParser(description = "Account management driver script parser.add_argument( "username", help="Username that should be locked/unlocked") parser.add_argument( - "state", choices=['ok', 'blocked', 'certification'], help="Choose from states (ok,blocked,certification)") + "state", choices=['ok', 'hold', 'certification'], help="Choose from states (ok,hold,certification)") parser.add_argument( "-s", "--service", nargs='+', default='all', choices=['ssh', 'newjobs', 'expiration', 'all'], help="List one or more services to be blocked (default: %(default)s)") parser.add_argument( diff --git a/prod_rmq_agents/acct_mgmt_workflow.py b/prod_rmq_agents/acct_mgmt_workflow.py index 922d802f77f285ad7a748789463bb7a41f8143a3..0907fa038bfdfed4ad08f6743d7541204bae40fe 100755 --- a/prod_rmq_agents/acct_mgmt_workflow.py +++ b/prod_rmq_agents/acct_mgmt_workflow.py @@ -31,7 +31,7 @@ def manage_acct(ch, method, properties, body): current = tracking[username] = {} if op == 'request': - if state == 'blocked' or state == 'certification': + if state == 'hold' or state == 'certification': msg["action"] = "lock" elif state == 'ok': msg["action"] = "unlock"