remove acl reference

orange-cloudfoundry · Jun 13, 2023 · c1d838c · c1d838c
1 parent 1bfded8
commit c1d838c
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 328 deletions.
diff --git a/terraform/cloudstack/input_generator.go b/terraform/cloudstack/input_generator.go
@@ -26,7 +26,6 @@ func (i InputGenerator) Generate(state storage.State) (map[string]interface{}, e
 		"cloudstack_endpoint": state.CloudStack.Endpoint,
 		"cloudstack_zone":     state.CloudStack.Zone,
 		"short_env_id":        shortEnvID,
-		"secure":              state.CloudStack.Secure,
 		"iso_segment":         state.CloudStack.IsoSegment,
 	}
 	if state.CloudStack.NetworkVpcOffering != "" {

diff --git a/terraform/cloudstack/input_generator_test.go b/terraform/cloudstack/input_generator_test.go
@@ -65,7 +65,6 @@ var _ = Describe("InputGenerator", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			Expect(inputs).To(Equal(map[string]interface{}{
-				"secure":              true,
 				"iso_segment":         true,
 				"env_id":              "some-env-id",
 				"cloudstack_endpoint": "http://my-cloudstack.com/client/api",

diff --git a/terraform/cloudstack/templates/resources-security-groups-vars.tf b/terraform/cloudstack/templates/resources-security-groups-vars.tf
diff --git a/terraform/cloudstack/templates/resources-security-groups.tf b/terraform/cloudstack/templates/resources-security-groups.tf
diff --git a/terraform/cloudstack/templates/resources-vars.tf b/terraform/cloudstack/templates/resources-vars.tf
@@ -37,10 +37,6 @@ variable "dns" {
   ]
 }
 
-variable "secure" {
-  default = false
-}
-
 variable "iso_segment" {
   default = false
 }
diff --git a/terraform/cloudstack/templates/resources.tf b/terraform/cloudstack/templates/resources.tf
@@ -64,10 +64,6 @@ resource "cloudstack_network" "bosh_subnet" {
   display_text     = "bosh-subnet"
   network_offering = var.network_vpc_offering
   zone             = var.cloudstack_zone
-  acl_id = var.secure ? element(
-    concat(cloudstack_network_acl.bosh_subnet_sec_group.*.id, [""]),
-    0,
-  ) : cloudstack_network_acl.allow_all.id
 }
 
 resource "cloudstack_network" "compilation_subnet" {
@@ -77,10 +73,6 @@ resource "cloudstack_network" "compilation_subnet" {
   display_text     = "compilation-subnet"
   network_offering = var.network_vpc_offering
   zone             = var.cloudstack_zone
-  acl_id = var.secure ? element(
-    concat(cloudstack_network_acl.bosh_subnet_sec_group.*.id, [""]),
-    0,
-  ) : cloudstack_network_acl.allow_all.id
 }
 
 resource "cloudstack_network" "control_plane" {
@@ -90,10 +82,6 @@ resource "cloudstack_network" "control_plane" {
   display_text     = "control-plane"
   network_offering = var.network_vpc_offering
   zone             = var.cloudstack_zone
-  acl_id = var.secure ? element(
-    concat(cloudstack_network_acl.control_plane_sec_group.*.id, [""]),
-    0,
-  ) : cloudstack_network_acl.allow_all.id
 }
 
 resource "cloudstack_network" "data_plane" {
@@ -103,10 +91,6 @@ resource "cloudstack_network" "data_plane" {
   display_text     = "data-plane"
   network_offering = var.network_vpc_offering
   zone             = var.cloudstack_zone
-  acl_id = var.secure ? element(
-    concat(cloudstack_network_acl.data_plane_sec_group.*.id, [""]),
-    0,
-  ) : cloudstack_network_acl.allow_all.id
 }
 
 resource "cloudstack_network" "data_plane_public" {
@@ -117,10 +101,6 @@ resource "cloudstack_network" "data_plane_public" {
   display_text     = "data-plane-public"
   network_offering = var.network_vpc_offering
   zone             = var.cloudstack_zone
-  acl_id = var.secure ? element(
-    concat(cloudstack_network_acl.data_plane_sec_group.*.id, [""]),
-    0,
-  ) : cloudstack_network_acl.allow_all.id
 }
 
 resource "cloudstack_ipaddress" "jumpbox_eip" {