X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/ae92d144610446849eb568247a44f02ae985c281..bcad695db9a1c3aac5807faa153086e653107f51:/lib/boot/supervisor.go?ds=sidebyside

diff --git a/lib/boot/supervisor.go b/lib/boot/supervisor.go
index 94cd5d0000..7e641c62dd 100644
--- a/lib/boot/supervisor.go
+++ b/lib/boot/supervisor.go
@@ -365,19 +365,19 @@ func (super *Supervisor) runCluster() error {
 		runNginx{},
 		runServiceCommand{name: "controller", svc: super.cluster.Services.Controller, depends: []supervisedTask{seedDatabase{}}},
 		runServiceCommand{name: "git-httpd", svc: super.cluster.Services.GitHTTP},
-		runGoProgram{src: "services/health", svc: super.cluster.Services.Health},
+		runServiceCommand{name: "health", svc: super.cluster.Services.Health},
 		runServiceCommand{name: "keepproxy", svc: super.cluster.Services.Keepproxy, depends: []supervisedTask{runPassenger{src: "services/api"}}},
 		runServiceCommand{name: "keepstore", svc: super.cluster.Services.Keepstore},
-		runGoProgram{src: "services/keep-web", svc: super.cluster.Services.WebDAV},
+		runServiceCommand{name: "keep-web", svc: super.cluster.Services.WebDAV},
 		runServiceCommand{name: "ws", svc: super.cluster.Services.Websocket, depends: []supervisedTask{seedDatabase{}}},
-		installPassenger{src: "services/api"},
-		runPassenger{src: "services/api", varlibdir: "railsapi", svc: super.cluster.Services.RailsAPI, depends: []supervisedTask{createCertificates{}, seedDatabase{}, installPassenger{src: "services/api"}}},
+		installPassenger{src: "services/api", varlibdir: "railsapi"},
+		runPassenger{src: "services/api", varlibdir: "railsapi", svc: super.cluster.Services.RailsAPI, depends: []supervisedTask{createCertificates{}, seedDatabase{}, installPassenger{src: "services/api", varlibdir: "railsapi"}}},
 		seedDatabase{},
 	}
 	if !super.NoWorkbench1 {
 		tasks = append(tasks,
-			installPassenger{src: "apps/workbench", depends: []supervisedTask{seedDatabase{}}}, // dependency ensures workbench doesn't delay api install/startup
-			runPassenger{src: "apps/workbench", varlibdir: "workbench1", svc: super.cluster.Services.Workbench1, depends: []supervisedTask{installPassenger{src: "apps/workbench"}}},
+			installPassenger{src: "apps/workbench", varlibdir: "workbench1", depends: []supervisedTask{seedDatabase{}}}, // dependency ensures workbench doesn't delay api install/startup
+			runPassenger{src: "apps/workbench", varlibdir: "workbench1", svc: super.cluster.Services.Workbench1, depends: []supervisedTask{installPassenger{src: "apps/workbench", varlibdir: "workbench1"}}},
 		)
 	}
 	if !super.NoWorkbench2 {
@@ -386,9 +386,13 @@ func (super *Supervisor) runCluster() error {
 		)
 	}
 	if super.ClusterType != "test" {
+		tasks = append(tasks,
+			runServiceCommand{name: "keep-balance", svc: super.cluster.Services.Keepbalance},
+		)
+	}
+	if super.cluster.Containers.CloudVMs.Enable {
 		tasks = append(tasks,
 			runServiceCommand{name: "dispatch-cloud", svc: super.cluster.Services.DispatchCloud},
-			runGoProgram{src: "services/keep-balance", svc: super.cluster.Services.Keepbalance},
 		)
 	}
 	super.tasksReady = map[string]chan bool{}
@@ -824,9 +828,6 @@ func (super *Supervisor) autofillConfig() error {
 		&super.cluster.Services.Workbench1,
 		&super.cluster.Services.Workbench2,
 	} {
-		if svc == &super.cluster.Services.DispatchCloud && super.ClusterType == "test" {
-			continue
-		}
 		if svc.ExternalURL.Host == "" {
 			port, err := nextPort(defaultExtHost)
 			if err != nil {