stop listening changes in storage and flist Changes

Author: Eslam-Nawara

pkg/environment/config.go

@@ -39,14 +39,14 @@ type Config struct {
 	BinRepo       string   `json:"bin_repo"`
 	GeoipURLs     []string `json:"geoip_urls"`
 
-	FlistURL   string `json:"flist_url"`
-	V4FlistURL string `json:"v4_flist_url"`
+	// FlistURL   string `json:"flist_url"`
+	// V4FlistURL string `json:"v4_flist_url"`
 
 	HubURL   string `json:"hub_url"`
 	V4HubURL string `json:"v4_hub_url"`
 
-	HubStorage   string `json:"hub_storage"`
-	V4HubStorage string `json:"v4_hub_storage"`
+	// HubStorage   string `json:"hub_storage"`
+	// V4HubStorage string `json:"v4_hub_storage"`
 }
 
 // Merge, updates current config with cfg merging and override config

pkg/environment/environment.go

@@ -143,9 +143,9 @@ var (
 			"https://activation.dev.grid.tf/activation/activate",
 			"https://activation.02.dev.grid.tf/activation/activate",
 		},
-		FlistURL:   defaultFlistURL,
 		HubURL:     defaultHubURL,
 		V4HubURL:   defaultV4HubURL,
+		FlistURL:   defaultFlistURL,
 		HubStorage: defaultHubStorage,
 		BinRepo:    "tf-zos-v3-bins.dev",
 		GraphQL: []string{
@@ -171,9 +171,9 @@ var (
 			"https://activation.test.grid.tf/activation/activate",
 			"https://activation.02.test.grid.tf/activation/activate",
 		},
-		FlistURL:   defaultFlistURL,
 		HubURL:     defaultHubURL,
 		V4HubURL:   defaultV4HubURL,
+		FlistURL:   defaultFlistURL,
 		HubStorage: defaultHubStorage,
 		BinRepo:    "tf-zos-v3-bins.test",
 		GraphQL: []string{
@@ -199,9 +199,9 @@ var (
 			"https://activation.qa.grid.tf/activation/activate",
 			"https://activation.02.qa.grid.tf/activation/activate",
 		},
-		FlistURL:   defaultFlistURL,
 		HubURL:     defaultHubURL,
 		V4HubURL:   defaultV4HubURL,
+		FlistURL:   defaultFlistURL,
 		HubStorage: defaultHubStorage,
 		BinRepo:    "tf-zos-v3-bins.qanet",
 		GraphQL: []string{
@@ -231,9 +231,9 @@ var (
 			"https://activation.02.grid.tf/activation/activate",
 			"https://activation.grid.threefold.me/activation/activate",
 		},
-		FlistURL:   defaultFlistURL,
 		HubURL:     defaultHubURL,
 		V4HubURL:   defaultV4HubURL,
+		FlistURL:   defaultFlistURL,
 		HubStorage: defaultHubStorage,
 		BinRepo:    "tf-zos-v3-bins",
 		GraphQL: []string{
@@ -368,14 +368,15 @@ func getEnvironmentFromParams(params kernel.Params) (Environment, error) {
 	if geoip := config.GeoipURLs; len(geoip) > 0 {
 		env.GeoipURLs = geoip
 	}
-
-	if flist := config.FlistURL; len(flist) > 0 {
-		env.FlistURL = flist
-	}
-
-	if storage := config.HubStorage; len(storage) > 0 {
-		env.HubStorage = storage
-	}
+	// flist url and hub urls shouldn't listen to changes in config as long as we can't change it at run time.
+	// it would cause breakage in vmd that needs a reboot to be recovered.
+	// if flist := config.FlistURL; len(flist) > 0 {
+	// 	env.FlistURL = flist
+	// }
+	//
+	// if storage := config.HubStorage; len(storage) > 0 {
+	// 	env.HubStorage = storage
+	// }
 
 	if hub := config.HubURL; len(hub) > 0 {
 		env.HubURL = hub
@@ -389,14 +390,14 @@ func getEnvironmentFromParams(params kernel.Params) (Environment, error) {
 	// if the node running v4 chage urls to use v4 hub
 	if params.IsV4() {
 		env.FlistURL = defaultV4FlistURL
-		if flist := config.V4FlistURL; len(flist) > 0 {
-			env.FlistURL = flist
-		}
+		// if flist := config.V4FlistURL; len(flist) > 0 {
+		// 	env.FlistURL = flist
+		// }
 
 		env.HubStorage = defaultV4HubStorage
-		if storage := config.V4HubStorage; len(storage) > 0 {
-			env.HubStorage = storage
-		}
+		// if storage := config.V4HubStorage; len(storage) > 0 {
+		// 	env.HubStorage = storage
+		// }
 
 	}