Remove unused internal_gw from TF outputs

- leaving it there causes panics when upgrading a vsphere env from v5.10.x to v5.11.x Signed-off-by: Rowan Jacobs <[email protected]>
cloudfoundry · Jan 9, 2018 · c1cbed2 · c1cbed2
1 parent 202f0c8
commit c1cbed2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/bosh/manager.go b/bosh/manager.go
@@ -374,6 +374,7 @@ func (m *Manager) GetJumpboxDeploymentVars(state storage.State, terraformOutputs
 		allOutputs[k] = v
 	}
 	delete(allOutputs, "external_ip")
+	delete(allOutputs, "internal_gw")
 	allOutputs["internal_cidr"] = internalCIDR
 
 	vars := sharedDeploymentVarsYAML{
@@ -453,6 +454,7 @@ func (m *Manager) GetDirectorDeploymentVars(state storage.State, terraformOutput
 		allOutputs[k] = v
 	}
 	delete(allOutputs, "external_ip")
+	delete(allOutputs, "internal_gw")
 	allOutputs["internal_cidr"] = internalCIDR
 
 	vars := sharedDeploymentVarsYAML{

diff --git a/bosh/manager_test.go b/bosh/manager_test.go
@@ -656,6 +656,7 @@ director_name: bosh-`))
 				vars := boshManager.GetJumpboxDeploymentVars(incomingState, terraform.Outputs{Map: map[string]interface{}{
 					"internal_cidr":     "10.80.30.0/24",
 					"external_ip":       "10.80.30.6",
+					"internal_gw":       "garbage",
 					"network_name":      "plum",
 					"vcenter_cluster":   "fruits",
 					"vcenter_disks":     "plum",
@@ -843,6 +844,7 @@ zone: some-zone
 			It("returns a correct yaml string of bosh deployment variables", func() {
 				vars := boshManager.GetDirectorDeploymentVars(incomingState, terraform.Outputs{Map: map[string]interface{}{
 					"some-key":                  "some-value",
+					"internal_gw":               "garbage",
 					"internal_cidr":             "10.0.1.0/24",
 					"bosh_director_tag_name":    "some-director-tag",
 					"bosh_director_external_ip": "some-external-ip",