diff --git a/lib/vsc/administration/user.py b/lib/vsc/administration/user.py index f10c7cbb..7c635138 100644 --- a/lib/vsc/administration/user.py +++ b/lib/vsc/administration/user.py @@ -111,7 +111,7 @@ class VscTier2AccountpageUser(VscAccountPageUser): A user on each of our Tier-2 system using the account page REST API to retrieve its information. """ - def __init__(self, user_id, storage=None, pickle_storage='VSC_SCRATCH_DELCATTY', rest_client=None, + def __init__(self, user_id, storage=None, pickle_storage='VSC_SCRATCH_KYUKON', rest_client=None, account=None, pubkeys=None): """ Initialisation. @@ -567,12 +567,12 @@ def __setattr__(self, name, value): cluster_user_pickle_location_map = { - 'delcatty': VscTier2AccountpageUser, + 'kyukon': VscTier2AccountpageUser, 'muk': MukAccountpageUser, } cluster_user_pickle_store_map = { - 'delcatty': 'VSC_SCRATCH_DELCATTY', + 'kyukon': 'VSC_SCRATCH_KYUKON', 'muk': 'VSC_SCRATCH_MUK', } @@ -624,7 +624,7 @@ def process_users_quota(options, user_quota, storage_name, client): if storage_name in ['VSC_DATA']: user.set_data_quota() - if storage_name in ['VSC_SCRATCH_DELCATTY', 'VSC_SCRATCH_PHANPY']: + if storage_name in GENT_PRODUCTION_SCRATCH: user.set_scratch_quota(storage_name) ok_quota.append(quota) diff --git a/setup.py b/setup.py index b4df1bf6..a1ef181e 100644 --- a/setup.py +++ b/setup.py @@ -23,7 +23,7 @@ from vsc.install.shared_setup import ag PACKAGE = { - 'version': '0.36.3', + 'version': '0.37.0', 'author': [ag], 'maintainer': [ag], 'tests_require': ['mock'],