Merge pull request #2214 from oracle/release_gh

Author: tf-oci-pub

CHANGELOG.md

@@ -1,3 +1,16 @@
+## 6.13.0 (October 09, 2024)
+
+### Added
+- Desktop as a Service: Shape Flexibility
+- Support for Operations Insights : Autonomous Database IAM based connections
+- Support for Customer Facing Scalable agent upgrade | ExaCC and ExaCS
+- 9/24- Support for ZPR v1
+- Support for PV Support for Launch w/Multiple Attachments Support for VMs
+- Support for Stack Monitoring Maintenance Windows
+- To Support for Depracate old apps admin user creation with password
+- Support for Desktop as a Service: Private Access
+- Support for Proxy Protocol on OCI LBaaS
+
 ## 6.12.0 (October 02, 2024)
 
 ### Added

examples/compute/instance/vm_multi_attach_instance.tf

@@ -5,10 +5,17 @@ variable "vm_multi_attach_instance_shape" {
   default = "VM.Standard2.1"
 }
 
-resource "oci_core_volume" "test_block_volume_multi_attach" {
+resource "oci_core_volume" "test_block_volume_multi_attach_iscsi" {
   availability_domain = data.oci_identity_availability_domain.ad.name
   compartment_id      = var.compartment_ocid
-  display_name        = "test_attach_existing_volume_on_instance_launch_1"
+  display_name        = "test_attach_existing_volume_on_instance_launch_iscsi"
+  size_in_gbs         = var.db_size
+}
+
+resource "oci_core_volume" "test_block_volume_multi_attach_pv" {
+  availability_domain = data.oci_identity_availability_domain.ad.name
+  compartment_id      = var.compartment_ocid
+  display_name        = "test_attach_existing_volume_on_instance_launch_pv"
   size_in_gbs         = var.db_size
 }
 
@@ -35,7 +42,7 @@ resource "oci_core_instance" "test_vm_multi_attach_instance_launch" {
     kms_key_id = var.kms_key_ocid
   }
 
-  // Create and attach a volume
+  // Create and attach a volume - iscsi
   launch_volume_attachments {
     type = "iscsi"
     display_name = "test_create_and_attach_volume_on_launch_1"
@@ -47,9 +54,9 @@ resource "oci_core_instance" "test_vm_multi_attach_instance_launch" {
     }
   }
 
-  // Create and attach a volume
+  // Create and attach a volume - pv
   launch_volume_attachments {
-    type = "iscsi"
+    type = "paravirtualized"
     display_name = "test_create_and_attach_volume_on_launch_2"
     launch_create_volume_details {
       volume_creation_type = "ATTRIBUTES"
@@ -59,11 +66,18 @@ resource "oci_core_instance" "test_vm_multi_attach_instance_launch" {
     }
   }
 
-  // Attach an existing volume
+  // Attach an existing volume - iscsi
   launch_volume_attachments {
     type = "iscsi"
     display_name = "test_attach_existing_volume_on_launch"
-    volume_id = oci_core_volume.test_block_volume_multi_attach.id
+    volume_id = oci_core_volume.test_block_volume_multi_attach_iscsi.id
+  }
+
+  // Attach an existing volume - pv
+  launch_volume_attachments {
+    type = "paravirtualized"
+    display_name = "test_attach_existing_volume_on_launch"
+    volume_id = oci_core_volume.test_block_volume_multi_attach_pv.id
   }
 
   # Apply the following flag only if you wish to preserve the attached boot volume upon destroying this instance

examples/database/db_systems/db_exacs/resources.tf

@@ -44,6 +44,14 @@ resource "oci_database_cloud_vm_cluster" "test_cloud_vm_cluster" {
     is_health_monitoring_enabled = "true"
     is_incident_logs_enabled = "true"
   }
+
+  cloud_automation_update_details{
+    is_early_adoption_enabled = "true"
+    apply_update_time_preference  {
+      apply_update_preferred_start_time = "02:00"
+      apply_update_preferred_end_time = "08:00"
+    }
+  }
 }
 
 resource "oci_database_db_home" "test_db_home_vm_cluster" {

examples/database/exadata_cc/autonomous_virtual_machine.tf

@@ -5,7 +5,7 @@ variable "autonomous_virtual_machine_state" {
 data "oci_database_autonomous_virtual_machines" "test_autonomous_virtual_machines" {
   #Required
   autonomous_vm_cluster_id = oci_database_autonomous_vm_cluster.test_autonomous_vm_cluster.id
-  compartment_id           = var.compartment_id
+  compartment_id           = var.compartment_ocid
 
   #Optional
   state = var.autonomous_virtual_machine_state

examples/database/exadata_cc/autonomous_vm_cluster.tf

@@ -5,7 +5,7 @@ resource "oci_database_autonomous_vm_cluster" "test_autonomous_vm_cluster" {
   compartment_id            = var.compartment_ocid
   display_name              = "autonomousVmCluster"
   exadata_infrastructure_id = oci_database_exadata_infrastructure.test_exadata_infrastructure.id
-  vm_cluster_network_id     = oci_database_vm_cluster_network.test_vm_cluster_network.id
+  vm_cluster_network_id     = oci_database_vm_cluster_network.test_vm_cluster_network2.id
   cpu_core_count_per_node   = "20"
   autonomous_data_storage_size_in_tbs = "2.0"
   memory_per_oracle_compute_unit_in_gbs = "5"

examples/database/exadata_cc/vm_cluster.tf

@@ -88,6 +88,94 @@ resource "oci_database_vm_cluster_network" "test_vm_cluster_network" {
   }
 }
 
+resource "oci_database_vm_cluster_network" "test_vm_cluster_network2" {
+  compartment_id = var.compartment_ocid
+  display_name   = "testVmClusterRecommendedNetwork2"
+  dns            = ["192.178.10.10"]
+  ntp            = ["192.178.10.20"]
+
+  exadata_infrastructure_id = oci_database_exadata_infrastructure.test_exadata_infrastructure.id
+
+  scans {
+    hostname = "myprefix3-nsubz-scan"
+
+    ips = [
+      "192.178.19.7",
+      "192.178.19.6",
+      "192.178.19.8",
+    ]
+
+    port = 1521
+    scan_listener_port_tcp = 1521
+    scan_listener_port_tcp_ssl = 2484
+  }
+
+  vm_networks {
+    domain_name  = "oracle.com"
+    gateway      = "192.179.20.1"
+    netmask      = "255.255.0.0"
+    network_type = "BACKUP"
+
+    nodes {
+      hostname = "myprefix4-cghdm1"
+      ip       = "192.179.19.18"
+      db_server_id = data.oci_database_db_servers.test_db_servers.db_servers.0.id
+    }
+
+    nodes {
+      hostname = "myprefix4-cghdm2"
+      ip       = "192.179.19.20"
+      db_server_id = data.oci_database_db_servers.test_db_servers.db_servers.1.id
+    }
+
+    vlan_id = "31"
+  }
+
+  vm_networks {
+    domain_name  = "oracle.com"
+    gateway      = "192.178.20.1"
+    netmask      = "255.255.0.0"
+    network_type = "CLIENT"
+
+    nodes {
+      hostname     = "myprefix5-r64zc1"
+      ip           = "192.178.19.10"
+      vip          = "192.178.19.11"
+      vip_hostname = "myprefix5-r64zc1-vip"
+      db_server_id = data.oci_database_db_servers.test_db_servers.db_servers.0.id
+    }
+
+    nodes {
+      hostname     = "myprefix5-r64zc2"
+      ip           = "192.178.19.14"
+      vip          = "192.178.19.15"
+      vip_hostname = "myprefix5-r64zc2-vip"
+      db_server_id = data.oci_database_db_servers.test_db_servers.db_servers.1.id
+    }
+
+    vlan_id = "41"
+  }
+
+  #Optional
+  defined_tags = {
+    "${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}" = "updatedvalue"
+  }
+
+  freeform_tags = {
+    "Department" = "Accounting"
+  }
+
+  validate_vm_cluster_network = true
+
+  action = "ADD_DBSERVER_NETWORK"
+
+  lifecycle {
+    ignore_changes = [
+      vm_networks,
+    ]
+  }
+}
+
 data "oci_database_gi_versions" "gi_version" {
   compartment_id = var.compartment_ocid
   shape = "ExadataCC.Quarter3.100"
@@ -125,6 +213,14 @@ resource "oci_database_vm_cluster" "test_vm_cluster" {
       is_incident_logs_enabled = "true"
   }
 
+  cloud_automation_update_details{
+    is_early_adoption_enabled = "true"
+    apply_update_time_preference  {
+      apply_update_preferred_start_time = "02:00"
+      apply_update_preferred_end_time = "08:00"
+    }
+  }
+
 }
 
 data "oci_database_db_servers" "test_db_servers" {
@@ -172,7 +268,12 @@ data "oci_database_vm_cluster_recommended_network" "test_vm_cluster_recommended_
 
 resource "oci_database_db_home" "test_db_home_vm_cluster" {
   vm_cluster_id = oci_database_vm_cluster.test_vm_cluster.id
+  source       = "VM_CLUSTER_NEW"
+  db_version   = "12.1.0.2"
+  display_name = "createdDbHome"
+}
 
+resource "oci_database_database" "test_exacc_database"{
   database {
     admin_password = "BEstrO0ng_#11"
     db_name        = "dbVMClus"
@@ -195,10 +296,8 @@ resource "oci_database_db_home" "test_db_home_vm_cluster" {
       }
     }
   }
-
-  source       = "VM_CLUSTER_NEW"
-  db_version   = "12.1.0.2"
-  display_name = "createdDbHome"
+  db_home_id = oci_database_db_home.test_db_home_vm_cluster.id
+  source     = "NONE"
 }
 
 resource "oci_database_backup_destination" "test_backup_destination_nfs" {

examples/desktops/desktop_pool/main.tf

@@ -63,6 +63,14 @@ resource "oci_desktops_desktop_pool" "test_desktop_pool" {
   #  nsg_ids              = var.desktop_pool_nsg_ids
   #  time_start_scheduled = var.desktop_pool_time_start_scheduled
   #  time_stop_scheduled  = var.desktop_pool_time_stop_scheduled
+  #  private_access_details {
+    #    #Required
+    #    subnet_id = var.desktop_pool_private_access_details_subnet_id
+    #
+    #    #Optional
+    #    nsg_ids    = var.desktop_pool_private_access_details_nsg_ids
+    #    private_ip = var.desktop_pool_private_access_details_private_ip
+    #  }
 }
 
 data "oci_desktops_desktop_pools" "test_desktop_pools_datasource" {
@@ -72,7 +80,7 @@ data "oci_desktops_desktop_pools" "test_desktop_pools_datasource" {
   #Optional
   #  availability_domain = data.oci_identity_availability_domain.ad.name
   #  display_name        = var.desktop_pool_display_name
-  #  id                  = var.desktop_pool_id
+  id                     = oci_desktops_desktop_pool.test_desktop_pool.id
   #  state               = var.desktop_pool_state
 }
 

examples/desktops/desktop_pool/private_access/desktops-private-access-phx.auto.tfvars.example

@@ -0,0 +1,19 @@
+# OCI config profile
+config_file_profile="terraform-federation-test"
+
+# region (us-phoenix-1, ca-toronto-1, etc)
+region="us-phoenix-1"
+
+# Secure Desktops Example Configuration
+
+compartment_id                                  = "<compartment_ocid>"
+
+desktop_pool_vcn_id                             = "<vcn_ocid>"
+desktop_pool_subnet_id                          = "<subnet_ocid>"
+desktop_pool_image_id                           = "<image_ocid>"
+desktop_pool_image_name                         = "<image_name>"
+desktop_pool_backup_policy_id                   = "<volume_backup_policy_ocid>"
+desktop_pool_contact_details                    = "test%40example.com"
+desktop_pool_private_access_details_subnet_id   = "<private_access_subnet_ocid>"
+desktop_pool_private_access_details_nsg_ids     = "[<private_access_nsg_ids>]"
+desktop_pool_private_access_details_private_ip  = "<private_access_private_ip>"