Connectivity to CCMS feature readded

cmd/cc-backend/main.go

@@ -97,12 +97,6 @@ func main() {
 		} else {
 			cclog.Abort("Cluster configuration must be present")
 		}
-
-		if mscfg := ccconf.GetPackageConfig("metric-store"); mscfg != nil {
-			config.InitMetricStore(mscfg)
-		} else {
-			cclog.Abort("Metric Store configuration must be present")
-		}
 	} else {
 		cclog.Abort("Main configuration must be present")
 	}
@@ -251,8 +245,15 @@ func main() {
 	var wg sync.WaitGroup
 
 	//Metric Store starts after all flags have been processes
-	memorystore.Init(&wg)
+	if config.InternalCCMSFlag {
+		if mscfg := ccconf.GetPackageConfig("metric-store"); mscfg != nil {
+			config.InitMetricStore(mscfg)
+		} else {
+			cclog.Abort("Metric Store configuration must be present")
+		}
 
+		memorystore.Init(&wg)
+	}
 	archiver.Start(repository.GetJobRepository())
 
 	// // Comment out

cmd/cc-backend/server.go

@@ -241,10 +241,13 @@ func serverInit() {
 	routerConfig.SetupRoutes(secured, buildInfo)
 	apiHandle.MountApiRoutes(securedapi)
 	apiHandle.MountUserApiRoutes(userapi)
-	apiHandle.MountMetricStoreApiRoutes(metricstoreapi)
 	apiHandle.MountConfigApiRoutes(configapi)
 	apiHandle.MountFrontendApiRoutes(frontendapi)
 
+	if config.InternalCCMSFlag {
+		apiHandle.MountMetricStoreApiRoutes(metricstoreapi)
+	}
+
 	if config.Keys.EmbedStaticFiles {
 		if i, err := os.Stat("./var/img"); err == nil {
 			if i.IsDir() {
@@ -337,7 +340,9 @@ func serverShutdown() {
 	server.Shutdown(context.Background())
 
 	//Archive all the metric store data
-	memorystore.Shutdown()
+	if config.InternalCCMSFlag {
+		memorystore.Shutdown()
+	}
 
 	// Then, wait for any async archivings still pending...
 	archiver.WaitForArchiving()