diff --git a/coldfront/config/plugins/slurmrest.py b/coldfront/config/plugins/slurmrest.py index 14c1ab2e9..9047377e5 100644 --- a/coldfront/config/plugins/slurmrest.py +++ b/coldfront/config/plugins/slurmrest.py @@ -1,5 +1,4 @@ import logging -import sys from coldfront.config.base import INSTALLED_APPS from coldfront.config.env import ENV # noqa: F401 @@ -12,10 +11,6 @@ ] SLURMREST_CLUSTER_ATTRIBUTE_NAME = ENV.str("SLURM_CLUSTER_ATTRIBUTE_NAME", default="slurm_cluster") -SLURMREST_ACCOUNT_ATTRIBUTE_NAME = ENV.str("SLURM_ACCOUNT_ATTRIBUTE_NAME", default="slurm_account_name") -SLURMREST_SPECS_ATTRIBUTE_NAME = ENV.str("SLURM_SPECS_ATTRIBUTE_NAME", default="slurm_specs") -SLURMREST_USER_SPECS_ATTRIBUTE_NAME = ENV.str("SLURM_USER_SPECS_ATTRIBUTE_NAME", default="slurm_user_specs") - SLURMREST_NOOP = ENV.bool("SLURM_NOOP", default=False) SLURMREST_IGNORE_USERS = ENV.list("SLURM_IGNORE_USERS", default=["root"]) SLURMREST_IGNORE_ACCOUNTS = ENV.list("SLURM_IGNORE_ACCOUNTS", default=[]) @@ -24,22 +19,22 @@ for cluster in filter(None, ENV.str("SLURMREST_CLUSTERS", "").split(",")): cluster_name = f"SLURM_{cluster.upper()}" endpoint = ENV.str(f"{cluster_name}_ENDPOINT", default=None) - token = ENV.str(f"{cluster_name}_TOKEN", default=None) - if endpoint is None or token is None: + user_token = ENV.str(f"{cluster_name}_USERTOKEN", default=None) + user_name = ENV.str(f"{cluster_name}_USERNAME", default=None) + if endpoint is None or user_name is None or user_token is None: # this is an informational logging entry, but since this occurs # before the log handlers are configured, it needs to be at the - # warn level for the output to be visible in the build logs + # warn level for the output to be visible logger.warn( - "Configuring slurmrest cluster %r: %s and %s missing, adding dummy values", - cluster, - f"{cluster_name}_ENDPOINT", - f"{cluster_name}_TOKEN", + f"Configuring slurmrest cluster {cluster}: one of {cluster_name}_ENDPOINT/USERNAME/USERTOKEN is missing adding dummy values" ) endpoint = "dummy" - token = "dummy" + user_token = "dummy" + user_name = "dummy" SLURMREST_CLUSTERS[cluster] = { - "name": cluster, + "cluster_name": cluster, "base_url": endpoint, - "token": token, + "user_token": user_token, + "user_name": user_name, }