From f70e763f7f989b0becfae6d8eee90e0d475e8ceb Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Wed, 22 Jun 2022 10:17:53 -0400 Subject: [PATCH] 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 --- lib/boot/supervisor.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/boot/supervisor.go b/lib/boot/supervisor.go index 7e641c62dd..8eb375b874 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 -- 2.30.2