diff --git a/openpype/modules/deadline/plugins/publish/submit_max_deadline.py b/openpype/modules/deadline/plugins/publish/submit_max_deadline.py index e99752b7ab..65d08b9ef4 100644 --- a/openpype/modules/deadline/plugins/publish/submit_max_deadline.py +++ b/openpype/modules/deadline/plugins/publish/submit_max_deadline.py @@ -45,8 +45,6 @@ class MaxSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline, jobInfo = {} pluginInfo = {} group = None - deadline_pool = None - deadline_pool_secondary = None framePerTask = 1 optional = True @@ -91,10 +89,8 @@ class MaxSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline, ) job_info.Frames = frames - job_info.Pool = instance.data.get("primaryPool", - self.deadline_pool) - job_info.SecondaryPool = instance.data.get("secondaryPool", - self.deadline_pool_secondary) # noqa + job_info.Pool = instance.data.get("primaryPool") + job_info.SecondaryPool = instance.data.get("secondaryPool") attr_values = self.get_attr_values_from_data(instance.data) diff --git a/openpype/settings/defaults/project_settings/deadline.json b/openpype/settings/defaults/project_settings/deadline.json index 0cbd323299..dec6a405a0 100644 --- a/openpype/settings/defaults/project_settings/deadline.json +++ b/openpype/settings/defaults/project_settings/deadline.json @@ -44,8 +44,6 @@ "priority": 50, "chunk_size": 10, "group": "none", - "deadline_pool": "", - "deadline_pool_secondary": "", "framePerTask": 1 }, "NukeSubmitDeadline": { diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json b/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json index 9906939cc7..29551cc9f8 100644 --- a/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json +++ b/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json @@ -246,16 +246,6 @@ "key": "group", "label": "Group Name" }, - { - "type": "text", - "key": "deadline_pool", - "label": "Deadline pool" - }, - { - "type": "text", - "key": "deadline_pool_secondary", - "label": "Deadline pool (secondary)" - }, { "type": "number", "key": "framePerTask",