read deadline and muster "enabled" settings in maya render creator

This commit is contained in:
Milan Kolar 2020-12-21 22:09:59 +01:00
parent ff09244146
commit 4e521445ff

View file

@ -127,18 +127,18 @@ class CreateRender(avalon.maya.Creator):
system_settings = get_system_settings()["modules"] system_settings = get_system_settings()["modules"]
deadline_enabled = system_settings["deadline"]["enabled"]
muster_enabled = system_settings["muster"]["enabled"]
deadline_url = system_settings["deadline"]["DEADLINE_REST_URL"] deadline_url = system_settings["deadline"]["DEADLINE_REST_URL"]
muster_url = system_settings["muster"]["MUSTER_REST_URL"] muster_url = system_settings["muster"]["MUSTER_REST_URL"]
if deadline_url and muster_url: if deadline_enabled and muster_enabled:
self.log.error( self.log.error(
"Both Deadline and Muster are enabled. " "Cannot support both." "Both Deadline and Muster are enabled. " "Cannot support both."
) )
raise RuntimeError("Both Deadline and Muster are enabled") raise RuntimeError("Both Deadline and Muster are enabled")
if deadline_url is None: if deadline_enabled:
self.log.warning("Deadline REST API url not found.")
else:
argument = "{}/api/pools?NamesOnly=true".format(deadline_url) argument = "{}/api/pools?NamesOnly=true".format(deadline_url)
try: try:
response = self._requests_get(argument) response = self._requests_get(argument)
@ -155,9 +155,7 @@ class CreateRender(avalon.maya.Creator):
# set any secondary pools # set any secondary pools
self.data["secondaryPool"] = ["-"] + pools self.data["secondaryPool"] = ["-"] + pools
if muster_url is None: if muster_enabled:
self.log.warning("Muster REST API URL not found.")
else:
self.log.info(">>> Loading Muster credentials ...") self.log.info(">>> Loading Muster credentials ...")
self._load_credentials() self._load_credentials()
self.log.info(">>> Getting pools ...") self.log.info(">>> Getting pools ...")