Merge pull request #6 from prachidamle/add_env_id_to_rancher_suffix

Add environment UUID to rancher suffix added on LB targets
Dmitry1987 · Apr 28, 2016 · 058db1d · 058db1d
2 parents 96a2740 + 94cf6c6
commit 058db1d
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 15 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/_workspace/src/github.com/rancher/go-rancher-metadata/metadata/metadata.go b/Godeps/_workspace/src/github.com/rancher/go-rancher-metadata/metadata/metadata.go
diff --git a/Godeps/_workspace/src/github.com/rancher/go-rancher-metadata/metadata/types.go b/Godeps/_workspace/src/github.com/rancher/go-rancher-metadata/metadata/types.go
diff --git a/external-lb.go b/external-lb.go
@@ -30,8 +30,9 @@ func getProviderLBConfigs() (map[string]model.LBConfig, error) {
 		return nil, err
 	}
 	rancherConfigs := make(map[string]model.LBConfig, len(allConfigs))
+	suffix := "_" + m.EnvironmentUUID + "_" + targetRancherSuffix
 	for _, value := range allConfigs {
-		if strings.HasSuffix(value.LBTargetPoolName, targetRancherSuffix) {
+		if strings.HasSuffix(value.LBTargetPoolName, suffix) {
 			rancherConfigs[value.LBEndpoint] = value
 		}
 	}

diff --git a/main.go b/main.go
@@ -64,8 +64,8 @@ func setEnv() {
 
 	targetRancherSuffix = os.Getenv("LB_TARGET_RANCHER_SUFFIX")
 	if len(targetRancherSuffix) == 0 {
-		logrus.Info("LB_TARGET_RANCHER_SUFFIX is not set, using default suffix '_rancher.internal'")
-		targetRancherSuffix = "_rancher.internal"
+		logrus.Info("LB_TARGET_RANCHER_SUFFIX is not set, using default suffix 'rancher.internal'")
+		targetRancherSuffix = "rancher.internal"
 	}
 
 	lbEndpointServiceLabel = "io.rancher.service.external_lb_endpoint"

diff --git a/metadata/metadata.go b/metadata/metadata.go
@@ -14,10 +14,11 @@ const (
 )
 
 type MetadataClient struct {
-	MetadataClient *metadata.Client
+	MetadataClient  *metadata.Client
+	EnvironmentUUID string
 }
 
-func getEnvironmentName(m *metadata.Client) (string, error) {
+func getEnvironmentUUID(m *metadata.Client) (string, error) {
 	timeout := 30 * time.Second
 	var err error
 	var stack metadata.Stack
@@ -27,7 +28,7 @@ func getEnvironmentName(m *metadata.Client) (string, error) {
 			logrus.Errorf("Error reading stack info: %v...will retry", err)
 			time.Sleep(i)
 		} else {
-			return stack.EnvironmentName, nil
+			return stack.EnvironmentUUID, nil
 		}
 	}
 	return "", fmt.Errorf("Error reading stack info: %v", err)
@@ -39,13 +40,14 @@ func NewMetadataClient() (*MetadataClient, error) {
 		logrus.Fatalf("Failed to configure rancher-metadata: %v", err)
 	}
 
-	_, err = getEnvironmentName(m)
+	envUUID, err := getEnvironmentUUID(m)
 	if err != nil {
 		logrus.Fatalf("Error reading stack metadata info: %v", err)
 	}
 
 	return &MetadataClient{
-		MetadataClient: m,
+		MetadataClient:  m,
+		EnvironmentUUID: envUUID,
 	}, nil
 }
 
@@ -75,7 +77,7 @@ func (m *MetadataClient) GetMetadataLBConfigs(lbEndpointServiceLabel string, tar
 				logrus.Debugf("LB label exists for service : %v", service)
 				lbConfig := model.LBConfig{}
 				lbConfig.LBEndpoint = lb_endpoint
-				lbConfig.LBTargetPoolName = service.UUID + targetRancherSuffix
+				lbConfig.LBTargetPoolName = service.Name + "_" + m.EnvironmentUUID + "_" + targetRancherSuffix
 				if err = m.getContainerLBTargets(&lbConfig, service); err != nil {
 					continue
 				}