Added - Support for Include capacity reservation checks

Author: venkata aravind kadiyala

examples/disaster_recovery/dr_plan/dr_plan.tf

@@ -50,6 +50,10 @@ resource "oci_disaster_recovery_dr_plan" "test_dr_plan" {
   dr_protection_group_id = oci_disaster_recovery_dr_protection_group.test_dr_protection_group.id
   type                   = var.dr_plan_type
 
+  lifecycle {
+    ignore_changes = [defined_tags]
+  }
+
   #Optional
   defined_tags = map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "${var.dr_plan_defined_tags_value}")
   freeform_tags = var.dr_plan_freeform_tags

examples/disaster_recovery/dr_plan/dr_protection_group.tf

@@ -81,6 +81,11 @@ resource "oci_disaster_recovery_dr_protection_group" "test_dr_protection_group"
     peer_id     = oci_disaster_recovery_dr_protection_group.test_peer.id
     peer_region = var.dr_protection_group_association_peer_region
   }
+
+  lifecycle {
+    ignore_changes = [defined_tags]
+  }
+
   defined_tags = map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "${var.dr_protection_group_defined_tags_value}")
   freeform_tags = var.dr_protection_group_freeform_tags
 }

examples/disaster_recovery/dr_plan/tag_namespace.tf

@@ -51,6 +51,10 @@ resource "oci_identity_tag_namespace" "test_tag_namespace" {
   description    = var.tag_namespace_description
   name           = var.tag_namespace_name
 
+  lifecycle {
+    ignore_changes = [defined_tags]
+  }
+
   #Optional
   defined_tags = map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "${var.tag_namespace_defined_tags_value}")
   freeform_tags = var.tag_namespace_freeform_tags

examples/disaster_recovery/dr_plan/volume_group.tf

@@ -58,13 +58,17 @@ resource "oci_core_volume_group" "test_volume_group" {
     volume_ids              = oci_core_volume.source_volume_list.*.id
   }
 
+  lifecycle {
+    ignore_changes = [defined_tags]
+  }
+
   #Optional
   defined_tags = map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "${var.volume_group_defined_tags_value}")
   display_name     = var.volume_group_display_name
   freeform_tags    = var.volume_group_freeform_tags
   volume_group_replicas {
     #Required
-    availability_domain = data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name
+    availability_domain = data.oci_identity_availability_domains.test_availability_domains.availability_domains.1.name
 
     #Optional
     display_name = var.volume_group_volume_group_replicas_display_name

examples/disaster_recovery/dr_plan_execution/dr_plan.tf

@@ -31,6 +31,10 @@ resource "oci_disaster_recovery_dr_plan" "test_dr_plan" {
   dr_protection_group_id = oci_disaster_recovery_dr_protection_group.test_dr_protection_group.id
   type                   = var.dr_plan_type
 
+  lifecycle {
+    ignore_changes = [defined_tags]
+  }
+
   #Optional
   defined_tags = map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "${var.dr_plan_defined_tags_value}")
   freeform_tags = var.dr_plan_freeform_tags

examples/disaster_recovery/dr_plan_execution/dr_plan_execution.tf

@@ -64,6 +64,10 @@ resource "oci_disaster_recovery_dr_plan_execution" "test_dr_plan_execution" {
   }
   plan_id = oci_disaster_recovery_dr_plan.test_dr_plan.id
 
+  lifecycle {
+    ignore_changes = [defined_tags]
+  }
+
   #Optional
   defined_tags = map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "${var.dr_plan_execution_defined_tags_value}")
   display_name  = var.dr_plan_execution_display_name

examples/disaster_recovery/dr_plan_execution/dr_protection_group.tf

@@ -53,10 +53,10 @@ resource "oci_disaster_recovery_dr_protection_group" "test_peer" {
 
   #Optional
   members {
-    #Required   
-    member_id   = oci_core_volume_group.test_volume_group.id
+    #Required
+    member_id   = data.oci_core_volume_groups.test_volume_groups.volume_groups.0.id
     member_type = var.dr_protection_group_members_member_type
-    
+
     #Optional
     is_movable                       = var.dr_protection_group_members_is_movable
   }
@@ -81,6 +81,11 @@ resource "oci_disaster_recovery_dr_protection_group" "test_dr_protection_group"
     peer_id     = oci_disaster_recovery_dr_protection_group.test_peer.id
     peer_region = var.dr_protection_group_association_peer_region
   }
+
+  lifecycle {
+    ignore_changes = [defined_tags]
+  }
+
   defined_tags = map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "${var.dr_protection_group_defined_tags_value}")
   freeform_tags = var.dr_protection_group_freeform_tags
 }

examples/disaster_recovery/dr_plan_execution/tag_namespace.tf

@@ -51,6 +51,10 @@ resource "oci_identity_tag_namespace" "test_tag_namespace" {
   description    = var.tag_namespace_description
   name           = var.tag_namespace_name
 
+  lifecycle {
+    ignore_changes = [defined_tags]
+  }
+
   #Optional
   defined_tags = map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "${var.tag_namespace_defined_tags_value}")
   freeform_tags = var.tag_namespace_freeform_tags

examples/disaster_recovery/dr_plan_execution/volume_group.tf

@@ -6,7 +6,7 @@ variable "volume_group_defined_tags_value" {
 }
 
 variable "volume_group_display_name" {
-  default = "displayName"
+  default = "example-volume-group"
 }
 
 variable "volume_group_freeform_tags" {
@@ -34,54 +34,15 @@ variable "volume_group_volume_group_replicas_display_name" {
 }
 
 data "oci_identity_availability_domains" "test_availability_domains" {
-    compartment_id = var.tenancy_ocid
-}
-
-resource "oci_core_volume" "source_volume_list" {
-	count = 2
-	display_name = format("source-volume-%d", count.index + 1)
-
-	#Required
-	availability_domain = data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name
-	compartment_id = var.compartment_id
-}
-
-resource "oci_core_volume_group" "test_volume_group" {
-  #Required
-  availability_domain = data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name
-  compartment_id      = var.compartment_id
-  source_details {
-    #Required
-    type = var.volume_group_source_details_type
-
-    #Optional
-    volume_ids              = oci_core_volume.source_volume_list.*.id
-  }
-
-  #Optional
-  defined_tags = map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "${var.volume_group_defined_tags_value}")
-  display_name     = var.volume_group_display_name
-  freeform_tags    = var.volume_group_freeform_tags
-  volume_group_replicas {
-    #Required
-    availability_domain = data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name
-
-    #Optional
-    display_name = var.volume_group_volume_group_replicas_display_name
-  }
-
-  provisioner "local-exec" {
-    command = "sleep 60"
-  }
+  compartment_id = var.tenancy_ocid
 }
 
 data "oci_core_volume_groups" "test_volume_groups" {
   #Required
   compartment_id = var.compartment_id
 
   #Optional
-  availability_domain = "${data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name}"
+  availability_domain = data.oci_identity_availability_domains.test_availability_domains.availability_domains[0].name
   display_name        = var.volume_group_display_name
   state               = var.volume_group_state
 }
-

examples/disaster_recovery/dr_protection_group/dr_protection_group.tf

@@ -89,6 +89,10 @@ resource "oci_disaster_recovery_dr_protection_group" "test_dr_protection_group"
     namespace = data.oci_objectstorage_namespace.test_namespace.namespace
   }
 
+  lifecycle {
+    ignore_changes = [defined_tags]
+  }
+
   #Optional
   association {
     #Required