changed hardcoded tags for vcn to use variables (#53)

Signed-off-by: Ali Mukadam <[email protected]>

Author: hyder

docs/terraformoptions.adoc

@@ -235,8 +235,6 @@ Configuration Terraform Options:
 [source,hcl]
 ----
 tags = {
-    department  = ""
-    environment = "dev"
     role        = "bastion"
 }
 ----
@@ -309,8 +307,6 @@ tags = {
 [source,hcl]
 ----
 tags = {
-  department  = ""
-  environment = "dev"
   role        = "operator"
 }
 ----

examples/database/locals.tf

@@ -24,7 +24,7 @@ locals {
     internet_gateway_enabled = var.internet_gateway_enabled
     nat_gateway_enabled      = var.nat_gateway_enabled
     service_gateway_enabled  = var.service_gateway_enabled
-    tags                     = null
+    tags                     = var.tags["vcn"]
     vcn_cidr                 = var.vcn_cidr
     vcn_dns_label            = var.vcn_dns_label
     vcn_name                 = var.vcn_name
@@ -45,7 +45,7 @@ locals {
     notification_topic    = var.bastion_notification_topic
     ssh_private_key_path  = var.ssh_private_key_path
     ssh_public_key_path   = var.ssh_public_key_path
-    tags                  = null
+    tags                  = var.tags["bastion"]
     timezone              = var.bastion_timezone
     use_autonomous        = var.bastion_use_autonomous
   }
@@ -65,7 +65,7 @@ locals {
     notification_topic        = var.operator_notification_topic
     ssh_private_key_path      = var.ssh_private_key_path
     ssh_public_key_path       = var.ssh_public_key_path
-    tags                      = null
+    tags                      = var.tags["operator"]
     timezone                  = var.operator_timezone
   }
 

main.tf

@@ -16,13 +16,10 @@ module "vcn" {
   internet_gateway_enabled = var.oci_base_vcn.internet_gateway_enabled
   nat_gateway_enabled      = var.oci_base_vcn.nat_gateway_enabled
   service_gateway_enabled  = var.oci_base_vcn.service_gateway_enabled
-  tags = {
-    department  = "finance"
-    environment = "dev"
-  }
-  vcn_cidr      = var.oci_base_vcn.vcn_cidr
-  vcn_dns_label = var.oci_base_vcn.vcn_dns_label
-  vcn_name      = var.oci_base_vcn.vcn_name
+  tags                     = var.oci_base_vcn.tags
+  vcn_cidr                 = var.oci_base_vcn.vcn_cidr
+  vcn_dns_label            = var.oci_base_vcn.vcn_dns_label
+  vcn_name                 = var.oci_base_vcn.vcn_name
 }
 
 module "bastion" {

terraform.tfvars.example

@@ -22,7 +22,7 @@ oci_base_vcn = {
   nat_gateway_enabled          = true
   service_gateway_enabled      = true
   tags = {
-    department  = ""
+    department  = "finance"
     environment = "dev"
   }
   vcn_cidr                     = "10.0.0.0/16"
@@ -48,7 +48,7 @@ oci_base_bastion = {
   ssh_private_key_path  = ""
   ssh_public_key_path   = ""
   tags = {
-    department  = ""
+    department  = "finace"
     environment = "dev"
     role        = "bastion"
   }
@@ -72,7 +72,7 @@ oci_base_operator = {
   ssh_private_key_path      = ""
   ssh_public_key_path       = ""
   tags = {
-    department  = ""
+    department  = "finance"
     environment = "dev"
     role        = "operator"
   }

variables.tf

@@ -86,8 +86,6 @@ variable "oci_base_bastion" {
     ssh_private_key_path  = ""
     ssh_public_key_path   = ""
     tags = {
-      department  = ""
-      environment = "dev"
       role        = "bastion"
     }
     timezone = "Australia/Sydney"
@@ -132,8 +130,6 @@ variable "oci_base_operator" {
     ssh_private_key_path      = ""
     ssh_public_key_path       = ""
     tags = {
-      department  = ""
-      environment = "dev"
       role        = "operator"
     }
     timezone = "Australia/Sydney"