refactor to two projects

chrismarget-j · Aug 13, 2023 · 6a48d4c · 6a48d4c
1 parent 827c924
commit 6a48d4c
Show file tree

Hide file tree

Showing 22 changed files with 124 additions and 32 deletions.
diff --git a/_fabric/blueprint.tf → _modules/fabric/blueprint.tf b/_fabric/blueprint.tf → _modules/fabric/blueprint.tf
diff --git a/_fabric/data.tf → _modules/fabric/data.tf b/_fabric/data.tf → _modules/fabric/data.tf
diff --git a/_fabric/locals.tf → _modules/fabric/locals.tf b/_fabric/locals.tf → _modules/fabric/locals.tf
diff --git a/_fabric/output.tf → _modules/fabric/output.tf b/_fabric/output.tf → _modules/fabric/output.tf
diff --git a/_fabric/provider.tf → _modules/fabric/provider.tf b/_fabric/provider.tf → _modules/fabric/provider.tf
diff --git a/_fabric/resources.tf → _modules/fabric/resources.tf b/_fabric/resources.tf → _modules/fabric/resources.tf
diff --git a/_vpn_routing/connectivity_template.tf → ...ules/vpn_routing/connectivity_template.tf b/_vpn_routing/connectivity_template.tf → ...ules/vpn_routing/connectivity_template.tf
diff --git a/_vpn_routing/data.tf → _modules/vpn_routing/data.tf b/_vpn_routing/data.tf → _modules/vpn_routing/data.tf
diff --git a/_vpn_routing/output.tf → _modules/vpn_routing/output.tf b/_vpn_routing/output.tf → _modules/vpn_routing/output.tf
diff --git a/_vpn_routing/provider.tf → _modules/vpn_routing/provider.tf b/_vpn_routing/provider.tf → _modules/vpn_routing/provider.tf
diff --git a/_vpn_routing/routing_policy.tf → _modules/vpn_routing/routing_policy.tf b/_vpn_routing/routing_policy.tf → _modules/vpn_routing/routing_policy.tf
diff --git a/_vpn_routing/variable.tf → _modules/vpn_routing/variable.tf b/_vpn_routing/variable.tf → _modules/vpn_routing/variable.tf
diff --git a/fabric/.terraform.lock.hcl b/fabric/.terraform.lock.hcl
diff --git a/fabric/main.tf b/fabric/main.tf
@@ -0,0 +1,30 @@
+# the initial fabric construction happens in here
+module "fabric" {
+  source = "../_modules/fabric"
+}
+
+# the null resource "disappears", forcing replacement whenever a
+# trigger value is changed.
+resource "null_resource" "force_redeploy" {
+  depends_on = [module.fabric]
+  triggers = {
+    // replace this resource whenever staging blueprint is revised
+    fabric_staging_revision      = module.fabric.staging_revision
+  }
+}
+
+#// deploy resource depends on the null resource which vanishes with each new
+#// blueprint revision. This way the blueprint is redeployed after every change
+#resource "apstra_blueprint_deployment" "dc_1" {
+#  blueprint_id = module.fabric.blueprint_id
+#  comment      = "Deployment by Terraform {{.TerraformVersion}}, Apstra provider {{.ProviderVersion}}, User $USER."
+##  depends_on   = [module.fabric, module.vpn_routing, null_resource.force_redeploy]
+#}
+
+#module "vpn_routing" {
+#  source               = "./_vpn_routing"
+#  blueprint_id         = module.fabric.blueprint_id
+#  routing_zone_id      = module.fabric.routing_zone_id
+#  vpn_edge_router_ip   = local.vpn_edge_router_ip
+#  vpn_routing_policies = local.vpn_routing_policies
+#}
diff --git a/fabric/output.tf b/fabric/output.tf
@@ -0,0 +1,2 @@
+output blueprint_id { value = module.fabric.blueprint_id }
+output routing_zone_id { value = module.fabric.routing_zone_id }
diff --git a/provider.tf → fabric/provider.tf b/provider.tf → fabric/provider.tf
@@ -7,7 +7,7 @@ terraform {
   }
   backend "s3" {
     bucket = "inform-demo"
-    key    = "inform-demo/terraform.tfstate"
+    key    = "fabric/terraform.tfstate"
     region = "us-east-1"
   }
 }

diff --git a/main.tf b/main.tf
diff --git a/vpn/.terraform.lock.hcl b/vpn/.terraform.lock.hcl
diff --git a/vpn/data.tf b/vpn/data.tf
@@ -0,0 +1,8 @@
+data "terraform_remote_state" "fabric" {
+  backend = "s3"
+  config = {
+    bucket = "inform-demo"
+    key    = "fabric/terraform.tfstate"
+    region = "us-east-1"
+  }
+}
diff --git a/vpn/main.tf b/vpn/main.tf
@@ -0,0 +1,7 @@
+module "vpn_routing" {
+  source               = "../_modules/vpn_routing"
+  blueprint_id         = data.terraform_remote_state.fabric.outputs.blueprint_id
+  routing_zone_id      = data.terraform_remote_state.fabric.outputs.routing_zone_id
+  vpn_edge_router_ip   = local.vpn_edge_router_ip
+  vpn_routing_policies = local.vpn_routing_policies
+}
diff --git a/vpn_parameters.tf → vpn/parameters.tf b/vpn_parameters.tf → vpn/parameters.tf
diff --git a/vpn/provider.tf b/vpn/provider.tf
@@ -0,0 +1,19 @@
+terraform {
+  required_providers {
+    apstra = {
+      source  = "Juniper/apstra"
+      version = "0.27.2"
+    }
+  }
+  backend "s3" {
+    bucket = "inform-demo"
+    key    = "vpn/terraform.tfstate"
+    region = "us-east-1"
+  }
+}
+
+provider "apstra" {
+  tls_validation_disabled = true
+  blueprint_mutex_enabled = false
+  api_timeout             = 0
+}