Merge pull request #1678 from oracle/release_gh

Releasing version 4.96.0

Author: NagendraNigade

CHANGELOG.md

@@ -12,7 +12,7 @@ resource "oci_core_instance" "test_instance" {
   availability_domain = data.oci_identity_availability_domain.bastion_ad.name
   compartment_id      = var.compartment_ocid
   display_name        = "TestInstance"
-  shape               = "VM.Standard1.1"
+  shape               = "VM.Standard2.1"
 
   agent_config {
     are_all_plugins_disabled  = false
@@ -27,7 +27,7 @@ resource "oci_core_instance" "test_instance" {
   create_vnic_details {
     subnet_id        = oci_core_subnet.test_subnet.id
     display_name     = "Primaryvnic"
-    assign_public_ip = true
+    assign_public_ip = false
     hostname_label   = "testinstance"
   }
 

examples/bastion/instance.tf

@@ -10,7 +10,7 @@ resource "oci_core_service_gateway" "test_bastion_service_gateway" {
   display_name   = "sgw"
 
   services {
-    service_id = data.oci_core_services.test_bastion_services.services[1]["id"]
+    service_id = data.oci_core_services.test_bastion_services.services[0]["id"]
   }
 
   vcn_id = oci_core_vcn.test_bastion_vcn.id
@@ -21,7 +21,7 @@ resource "oci_core_default_route_table" "bastion_default_route_table" {
   display_name               = "DefaultRouteTable"
 
   route_rules {
-    destination       = lookup(data.oci_core_services.test_bastion_services.services[1], "cidr_block")
+    destination       = lookup(data.oci_core_services.test_bastion_services.services[0], "cidr_block")
     destination_type  = "SERVICE_CIDR_BLOCK"
     network_entity_id = oci_core_service_gateway.test_bastion_service_gateway.id
   }

examples/bastion/network.tf

@@ -36,7 +36,7 @@ variable "session_target_resource_details_target_resource_port" {
 resource "time_sleep" "wait_3_minutes_for_bastion_plugin" {
   depends_on = [oci_core_instance.test_instance]
 
-  create_duration = "3m"
+  create_duration = "5m"
 }
 
 resource "oci_bastion_session" "test_session_managed_ssh" {

examples/bastion/session.tf

@@ -42,7 +42,7 @@ resource "oci_database_exadata_infrastructure" "test_exadata_infrastructure" {
   infini_band_network_cidr    = "10.31.8.0/21"
   netmask                     = "255.255.255.0"
   ntp_server                  = ["10.231.225.76"]
-  shape                       = "ExadataCC.Quarter3.100"
+  shape                       = "ExadataCC.X7"
   time_zone                   = "US/Pacific"
   activation_file             = "activation.zip"
   storage_count               = 3

examples/database/exadata_cc/exadata-infrastructure.tf

@@ -31,11 +31,13 @@ resource "oci_database_vm_cluster_network" "test_vm_cluster_network" {
     nodes {
       hostname = "myprefix2-cghdm1"
       ip       = "192.169.19.18"
+      db_server_id = data.oci_database_db_servers.test_db_servers.db_servers.0.id
     }
 
     nodes {
       hostname = "myprefix2-cghdm2"
       ip       = "192.169.19.20"
+      db_server_id = data.oci_database_db_servers.test_db_servers.db_servers.1.id
     }
 
     vlan_id = "11"
@@ -52,13 +54,15 @@ resource "oci_database_vm_cluster_network" "test_vm_cluster_network" {
       ip           = "192.168.19.10"
       vip          = "192.168.19.11"
       vip_hostname = "myprefix1-r64zc1-vip"
+      db_server_id = data.oci_database_db_servers.test_db_servers.db_servers.0.id
     }
 
     nodes {
       hostname     = "myprefix1-r64zc2"
       ip           = "192.168.19.14"
       vip          = "192.168.19.15"
       vip_hostname = "myprefix1-r64zc2-vip"
+      db_server_id = data.oci_database_db_servers.test_db_servers.db_servers.1.id
     }
 
     vlan_id = "10"
@@ -74,6 +78,14 @@ resource "oci_database_vm_cluster_network" "test_vm_cluster_network" {
   }
 
   validate_vm_cluster_network = true
+
+  action = "ADD_DBSERVER_NETWORK"
+
+  lifecycle {
+    ignore_changes = [
+      vm_networks,
+    ]
+  }
 }
 
 data "oci_database_gi_versions" "gi_version" {

examples/database/exadata_cc/vm_cluster.tf

@@ -20,7 +20,7 @@ variable "region" {
 }
 
 provider "oci" {
-  #version = "4.62.0"
+  #version = "4.92.0"
   region           = var.region
   tenancy_ocid     = var.tenancy_ocid
   user_ocid        = var.user_ocid
@@ -58,8 +58,8 @@ resource "oci_devops_deploy_pipeline" "test_deploy_pipeline" {
   #Required
   project_id = oci_devops_project.test_project.id
 
-  description   = "description"
-  display_name  = "displayName"
+  description  = "description"
+  display_name = "displayName"
 }
 
 resource "oci_devops_deploy_stage" "test_wait_deploy_stage" {
@@ -74,8 +74,8 @@ resource "oci_devops_deploy_stage" "test_wait_deploy_stage" {
   }
   deploy_stage_type = "WAIT"
 
-  description                                  = "description"
-  display_name                                 = "displayName"
+  description  = "description"
+  display_name = "displayName"
   wait_criteria {
     #Required
     wait_duration = "PT5S"
@@ -89,5 +89,6 @@ resource "oci_devops_deployment" "test_deployment" {
   deployment_type    = "PIPELINE_DEPLOYMENT"
 
   #Optional
-  display_name           = "test_deployment"
+  display_name                  = "test_deployment"
+  trigger_new_devops_deployment = false
 }

examples/devops/deployment_service/wait_deploy_stage/wait_deploy_stage.tf

@@ -84,3 +84,26 @@ data "oci_core_private_ips" "ip_mount_target1" {
   }
 }
 
+# Gets a list of replications in a compartment and availability domain
+data "oci_file_storage_replications" "test_replications" {
+  #Required
+  availability_domain = data.oci_identity_availability_domain.ad.name
+  compartment_id      = var.compartment_ocid
+
+  #Optional
+  #display_name   = var.replication_display_name
+  #file_system_id = oci_file_storage_file_system.test_file_system.id
+  #id             = var.replication_id
+  #state          = var.replication_state
+}
+
+data "oci_file_storage_replication_targets" "test_replication_targets" {
+  #Required
+  availability_domain = data.oci_identity_availability_domain.ad.name
+  compartment_id      = var.compartment_ocid
+
+  #Optional
+  #display_name = var.replication_target_display_name
+  #id           = var.replication_target_id
+  #state        = var.replication_target_state
+}