X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/42b483f3a722ad8a506040160e54d0080a197318..dc543546ef67fc3a7aca4b8208cafe64c94f3731:/lib/config/deprecated.go

diff --git a/lib/config/deprecated.go b/lib/config/deprecated.go
index c8f943f3cc..8ffa2a5834 100644
--- a/lib/config/deprecated.go
+++ b/lib/config/deprecated.go
@@ -20,13 +20,33 @@ type deprRequestLimits struct {
 
 type deprCluster struct {
 	RequestLimits deprRequestLimits
-	NodeProfiles  map[string]arvados.NodeProfile
+	NodeProfiles  map[string]nodeProfile
 }
 
 type deprecatedConfig struct {
 	Clusters map[string]deprCluster
 }
 
+type nodeProfile struct {
+	Controller    systemServiceInstance `json:"arvados-controller"`
+	Health        systemServiceInstance `json:"arvados-health"`
+	Keepbalance   systemServiceInstance `json:"keep-balance"`
+	Keepproxy     systemServiceInstance `json:"keepproxy"`
+	Keepstore     systemServiceInstance `json:"keepstore"`
+	Keepweb       systemServiceInstance `json:"keep-web"`
+	Nodemanager   systemServiceInstance `json:"arvados-node-manager"`
+	DispatchCloud systemServiceInstance `json:"arvados-dispatch-cloud"`
+	RailsAPI      systemServiceInstance `json:"arvados-api-server"`
+	Websocket     systemServiceInstance `json:"arvados-ws"`
+	Workbench1    systemServiceInstance `json:"arvados-workbench"`
+}
+
+type systemServiceInstance struct {
+	Listen   string
+	TLS      bool
+	Insecure bool
+}
+
 func applyDeprecatedConfig(cfg *arvados.Config, configdata []byte, log logger) error {
 	var dc deprecatedConfig
 	err := yaml.Unmarshal(configdata, &dc)
@@ -63,7 +83,7 @@ func applyDeprecatedConfig(cfg *arvados.Config, configdata []byte, log logger) e
 	return nil
 }
 
-func applyDeprecatedNodeProfile(hostname string, ssi arvados.SystemServiceInstance, svc *arvados.Service) {
+func applyDeprecatedNodeProfile(hostname string, ssi systemServiceInstance, svc *arvados.Service) {
 	scheme := "https"
 	if !ssi.TLS {
 		scheme = "http"