[arvados] updated: 2.1.0-2615-gf70e763f7

[git repository hosting]

Summary of changes:
 lib/boot/supervisor.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

       via  f70e763f7f989b0becfae6d8eee90e0d475e8ceb (commit)
      from  0bab5ef7b173a6df95045cfee6b397e2a2638ccc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit f70e763f7f989b0becfae6d8eee90e0d475e8ceb
Author: Tom Clegg <tom at curii.com>
Date:   Wed Jun 22 10:17:53 2022 -0400

    Don't wait for arvados-dispatch-cloud to come up if not enabled.
    
    Should fix workbench2 test suite.
    
    No issue #
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/boot/supervisor.go b/lib/boot/supervisor.go
index 7e641c62d..8eb375b87 100644
--- a/lib/boot/supervisor.go
+++ b/lib/boot/supervisor.go
@@ -848,7 +848,8 @@ func (super *Supervisor) autofillConfig() error {
 			}
 		}
 		if super.NoWorkbench1 && svc == &super.cluster.Services.Workbench1 ||
-			super.NoWorkbench2 && svc == &super.cluster.Services.Workbench2 {
+			super.NoWorkbench2 && svc == &super.cluster.Services.Workbench2 ||
+			!super.cluster.Containers.CloudVMs.Enable && svc == &super.cluster.Services.DispatchCloud {
 			// When workbench1 is disabled, it gets an
 			// ExternalURL (so we have a valid listening
 			// port to write in our Nginx config) but no

-----------------------------------------------------------------------


hooks/post-receive
--