Deadline: fix selection from multiple webservices (#5015)

* OP-4380 - override default DL from project settings

* OP-4380 - updated documentation

openpype/modules/deadline/plugins/publish/collect_default_deadline_server.py

@@ -4,7 +4,18 @@ import pyblish.api
 
 
 class CollectDefaultDeadlineServer(pyblish.api.ContextPlugin):
-    """Collect default Deadline Webservice URL."""
+    """Collect default Deadline Webservice URL.
+
+    DL webservice addresses must be configured first in System Settings for
+    project settings enum to work.
+
+    Default webservice could be overriden by
+    `project_settings/deadline/deadline_servers`. Currently only single url
+    is expected.
+
+    This url could be overriden by some hosts directly on instances with
+    `CollectDeadlineServerFromInstance`.
+    """
 
     order = pyblish.api.CollectorOrder + 0.410
     label = "Default Deadline Webservice"
@@ -23,3 +34,16 @@ class CollectDefaultDeadlineServer(pyblish.api.ContextPlugin):
         context.data["defaultDeadline"] = deadline_module.deadline_urls["default"]  # noqa: E501
 
         context.data["deadlinePassMongoUrl"] = self.pass_mongo_url
+
+        deadline_servers = (context.data
+                            ["project_settings"]
+                            ["deadline"]
+                            ["deadline_servers"])
+        if deadline_servers:
+            deadline_server_name = deadline_servers[0]
+            deadline_webservice = deadline_module.deadline_urls.get(
+                deadline_server_name)
+            if deadline_webservice:
+                context.data["defaultDeadline"] = deadline_webservice
+                self.log.debug("Overriding from project settings with {}".format(  # noqa: E501
+                    deadline_webservice))

website/docs/module_deadline.md

@@ -22,6 +22,9 @@ For [AWS Thinkbox Deadline](https://www.awsthinkbox.com/deadline) support you ne
 
 5. Install our custom plugin and scripts to your deadline repository. It should be as simple as copying content of `openpype/modules/deadline/repository/custom` to `path/to/your/deadline/repository/custom`.
 
+Multiple different DL webservice could be configured. First set them in point 4., then they could be configured per project in `project_settings/deadline/deadline_servers`.
+Only single webservice could be a target of publish though.
+
 
 ## Configuration