Freeform tags for compute,vcn and subnets (#42)

* freeform tagging

Signed-off-by: Karthic Ravindran <[email protected]>

* newline addition

Signed-off-by: Karthic Ravindran <[email protected]>

Author: karthicgit

docs/terraformoptions.adoc

@@ -283,4 +283,23 @@ Configuration Terraform Options:
 |
 |Australia/Sydney
 
-|===
+|===
+
+== Tagging
+
+[stripes=odd,cols="1d,4d,3a,3a", options=header,width="100%"] 
+|===
+|Parameter
+|Description
+|Values
+|Default
+
+|computetag
+|Freeform tag for compute instances.
+|
+|
+
+|networktag
+|Freeform tag for network components like VCN and subnets.
+|
+|

locals.tf

@@ -71,4 +71,9 @@ locals {
     notification_protocol = var.oci_base_admin.notification_protocol
     notification_topic    = var.oci_base_admin.notification_topic
   }
+
+  tagging = {
+     computetag           = var.tagging.computetag
+     networktag           = var.tagging.networktag
+  }
 }

main.tf

@@ -4,6 +4,7 @@
 module "vcn" {
   source       = "./modules/vcn"
   oci_base_vcn = local.oci_base_vcn
+  tagging      = local.tagging
 }
 
 module "bastion" {
@@ -13,6 +14,7 @@ module "bastion" {
   oci_bastion_network      = local.oci_bastion_network
   oci_bastion              = local.oci_bastion
   oci_bastion_notification = local.oci_bastion_notification
+  tagging                  = local.tagging
 }
 
 module "admin" {
@@ -22,4 +24,5 @@ module "admin" {
   oci_admin_network      = local.oci_admin_network
   oci_admin              = local.oci_admin
   oci_admin_notification = local.oci_admin_notification
+  tagging                = local.tagging
 }

modules/admin/compute.tf

@@ -4,7 +4,8 @@
 resource "oci_core_instance" "admin" {
   availability_domain = element(var.oci_admin_network.ad_names, (var.oci_admin_network.availability_domains - 1))
   compartment_id      = var.oci_admin_identity.compartment_id
-
+  freeform_tags       = var.tagging.computetag
+  
   create_vnic_details {
     assign_public_ip = false
     subnet_id        = oci_core_subnet.admin[0].id

modules/admin/subnets.tf

@@ -10,6 +10,7 @@ resource "oci_core_subnet" "admin" {
   route_table_id             = var.oci_admin_network.nat_route_id
   security_list_ids          = [oci_core_security_list.admin[0].id]
   vcn_id                     = var.oci_admin_network.vcn_id
+  freeform_tags              = var.tagging.networktag
 
   count = var.oci_admin.admin_enabled == true ? 1 : 0
 }

modules/admin/variables.tf

@@ -60,3 +60,12 @@ variable "oci_admin_notification" {
   })
   description = "OCI notification parameters for admin"
 }
+
+#tagging
+variable "tagging" {
+  type = object({
+    computetag                = map(any)
+    networktag                = map(any)
+  }) 
+}
+

modules/bastion/compute.tf

@@ -4,6 +4,8 @@
 resource "oci_core_instance" "bastion" {
   availability_domain = element(var.oci_bastion_network.ad_names, (var.oci_bastion_network.availability_domains - 1))
   compartment_id      = var.oci_base_identity.compartment_id
+  freeform_tags       = var.tagging.computetag
+   
 
   create_vnic_details {
     assign_public_ip = true

modules/bastion/subnets.tf

@@ -10,6 +10,7 @@ resource "oci_core_subnet" "bastion" {
   route_table_id             = var.oci_bastion_network.ig_route_id
   security_list_ids          = [oci_core_security_list.bastion[0].id]
   vcn_id                     = var.oci_bastion_network.vcn_id
+  freeform_tags              = var.tagging.networktag
 
   count = var.oci_bastion.bastion_enabled == true ? 1 : 0
 }

modules/bastion/variables.tf

@@ -62,3 +62,11 @@ variable "oci_bastion_notification" {
   })
   description = "OCI notification parameters for bastion"
 }
+
+#tagging
+variable "tagging" {
+  type = object({
+    computetag                = map(any)
+    networktag                = map(any)
+  }) 
+}

modules/vcn/variables.tf

@@ -13,3 +13,11 @@ variable "oci_base_vcn" {
   })
   description = "vcn basic parameters"
 }
+
+#tagging
+variable "tagging" {
+  type = object({
+    computetag                = map(any)
+    networktag                = map(any)
+  }) 
+}