Skip to content

Commit 41ab0c3

Browse files
sagarp337sagarp337
authored
Merge pull request #2151 from oracle/release_gh
Releasing version 6.1.0
2 parents 677e6e4 + 7a09f3e commit 41ab0c3

File tree

950 files changed

+35216
-10020
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

950 files changed

+35216
-10020
lines changed

‎CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
## 6.1.0 (July 02, 2024)
2+
3+
### Added
4+
- Support for MySQL Homogenous Migration support
5+
- Support for Generative AI Service - Lora Fine-Tuning Method
6+
- Support for Resource Scheduler
7+
- Support for File Storage: Clone detach feature
8+
- Support for Oracle Exadata Database Service on Exascale Infrastructure | ExaDB-XS
9+
### Bug Fix
10+
- formatted database migration code
11+
- tagging in management_agent
12+
113
## 6.0.0 (June 26, 2024)
214

315
### Added

‎examples/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,8 @@ This directory contains Terraform configuration files showing how to create spec
205205
[![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle/terraform-provider-oci/raw/master/examples/zips/redis.zip)
206206
- resourcemanager
207207
[![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle/terraform-provider-oci/raw/master/examples/zips/resourcemanager.zip)
208+
- resourcescheduler
209+
[![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle/terraform-provider-oci/raw/master/examples/zips/resourcescheduler.zip)
208210
- serviceManagerProxy
209211
[![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle/terraform-provider-oci/raw/master/examples/zips/serviceManagerProxy.zip)
210212
- service_catalog

‎examples/database/db_systems/db_exadbxs/datasources.tf

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
// Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
2+
// Licensed under the Mozilla Public License v2.0
3+
4+
data "oci_identity_availability_domains" "test_availability_domains" {
5+
compartment_id = var.tenancy_ocid
6+
}
7+
8+
locals {
9+
ad = data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name
10+
}
11+
12+
data "oci_database_backups" "test_database_backups_by_exadbxs" {
13+
compartment_id = var.compartment_ocid
14+
shape_family = "EXADB_XS"
15+
}
16+
17+
data "oci_database_gi_versions" "test_gi_versions" {
18+
#Required
19+
compartment_id = var.compartment_ocid
20+
#Optional
21+
shape = "ExaDbXS"
22+
availability_domain = local.ad
23+
}
24+
25+
data "oci_database_gi_version_minor_versions" "test_gi_minor_versions" {
26+
#Required
27+
version = data.oci_database_gi_versions.test_gi_versions.gi_versions[0].version
28+
#Optional
29+
compartment_id = data.oci_database_gi_versions.test_gi_versions.compartment_id
30+
availability_domain = data.oci_database_gi_versions.test_gi_versions.availability_domain
31+
shape_family = "EXADB_XS"
32+
shape = data.oci_database_gi_versions.test_gi_versions.shape
33+
is_gi_version_for_provisioning = false
34+
}
35+

‎examples/database/db_systems/db_exadbxs/exadb_vm_cluster.tf

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
// Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
2+
// Licensed under the Mozilla Public License v2.0
3+
4+
resource "oci_database_exadb_vm_cluster" "test_exadb_vm_cluster" {
5+
6+
#Required
7+
availability_domain = local.ad
8+
compartment_id = var.compartment_ocid
9+
display_name = "ExampleExadbVmCluster"
10+
exascale_db_storage_vault_id = oci_database_exascale_db_storage_vault.test_exascale_db_storage_vault.id
11+
grid_image_id = data.oci_database_gi_version_minor_versions.test_gi_minor_versions.gi_minor_versions[0].grid_image_id
12+
hostname = "apollo"
13+
cluster_name = "apollo"
14+
shape = "EXADBXS"
15+
ssh_public_keys = [var.ssh_public_key]
16+
subnet_id = oci_core_subnet.exadbxs_client_subnet.id
17+
backup_subnet_id = oci_core_subnet.exadbxs_backup_subnet.id
18+
19+
node_config {
20+
enabled_ecpu_count_per_node = "8"
21+
total_ecpu_count_per_node = "16"
22+
vm_file_system_storage_size_gbs_per_node = "293"
23+
}
24+
25+
node_resource {
26+
node_name = "node1"
27+
}
28+
29+
node_resource {
30+
node_name = "node2"
31+
}
32+
33+
node_resource {
34+
node_name = "node3"
35+
}
36+
37+
}
38+
39+
data "oci_database_exadb_vm_clusters" "test_exadb_vm_clusters" {
40+
#Required
41+
compartment_id = var.compartment_ocid
42+
#Optional
43+
exascale_db_storage_vault_id = oci_database_exascale_db_storage_vault.test_exascale_db_storage_vault.id
44+
}
45+
46+
data "oci_database_exadb_vm_cluster" "test_exadb_vm_cluster" {
47+
#Required
48+
exadb_vm_cluster_id = oci_database_exadb_vm_cluster.test_exadb_vm_cluster.id
49+
}

‎examples/database/db_systems/db_exadbxs/exadb_vm_cluster_database.tf

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
// Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
2+
// Licensed under the Mozilla Public License v2.0
3+
4+
resource "oci_database_db_home" "test_db_home" {
5+
display_name = "ExampleExaDbVmDbHome"
6+
db_system_id = oci_database_exadb_vm_cluster.test_exadb_vm_cluster.id
7+
db_version = "23.4.0.24.05"
8+
}
9+
10+
resource "oci_database_database" "test_db1" {
11+
database {
12+
admin_password = var.test_db_password
13+
db_name = "TFDB1"
14+
}
15+
db_home_id = oci_database_db_home.test_db_home.id
16+
source = "NONE"
17+
}
18+
19+
resource "oci_database_database" "test_db2" {
20+
database {
21+
admin_password = var.test_db_password
22+
db_name = "TFDB2"
23+
}
24+
db_home_id = oci_database_db_home.test_db_home.id
25+
source = "NONE"
26+
}
27+
28+
resource "oci_database_pluggable_database" "test_db1_pdb" {
29+
container_database_id = oci_database_database.test_db1.id
30+
pdb_name = "DB1PDB"
31+
pdb_admin_password = var.test_db_password
32+
tde_wallet_password = var.test_db_password
33+
}
34+
35+
resource "oci_database_pluggable_database" "test_db1_local_cloned_pdb" {
36+
container_database_id = oci_database_database.test_db1.id
37+
pdb_name = "DB1LocalThinClonedPDB"
38+
pdb_admin_password = var.test_db_password
39+
tde_wallet_password = var.test_db_password
40+
pdb_creation_type_details {
41+
creation_type = "LOCAL_CLONE_PDB"
42+
source_pluggable_database_id = oci_database_pluggable_database.test_db1_pdb.id
43+
is_thin_clone = true
44+
}
45+
}
46+
47+
# resource "oci_database_pluggable_database" "test_db2_remote_cloned_pdb" {
48+
# container_database_id = oci_database_database.test_db2.id
49+
# pdb_name = "DB2RemoteThinClonedPDB"
50+
# pdb_admin_password = var.test_db_password
51+
# tde_wallet_password = var.test_db_password
52+
# pdb_creation_type_details {
53+
# creation_type = "REMOTE_CLONE_PDB"
54+
# source_container_database_admin_password = var.test_db_password
55+
# source_pluggable_database_id = oci_database_pluggable_database.test_db1_pdb.id
56+
# is_thin_clone = true
57+
# }
58+
# }
59+
60+
data "oci_database_pluggable_databases" "test_pdbs" {
61+
compartment_id = var.compartment_ocid
62+
state = "AVAILABLE"
63+
}
64+
65+
data "oci_database_pluggable_database" "test_db1_local_cloned_pdb" {
66+
pluggable_database_id = oci_database_pluggable_database.test_db1_local_cloned_pdb.id
67+
}

‎examples/database/db_systems/db_exadbxs/exadb_vm_cluster_db_node.tf

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
// Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
2+
// Licensed under the Mozilla Public License v2.0
3+
4+
# Get db node list
5+
data "oci_database_db_nodes" "test_exadb_vm_cluster_db_nodes" {
6+
compartment_id = var.compartment_ocid
7+
vm_cluster_id = oci_database_exadb_vm_cluster.test_exadb_vm_cluster.id
8+
}
9+
10+
# Get db node details
11+
data "oci_database_db_node" "test_exadb_vm_cluster_db_node" {
12+
db_node_id = data.oci_database_db_nodes.test_exadb_vm_cluster_db_nodes.db_nodes[0].id
13+
}

‎examples/database/db_systems/db_exadbxs/exadb_vm_cluster_update_history_entries.tf

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
data "oci_database_exadb_vm_cluster_update_history_entries" "test_exadb_vm_cluster_update_history_entries" {
2+
#Required
3+
exadb_vm_cluster_id = oci_database_exadb_vm_cluster.test_exadb_vm_cluster.id
4+
#Optional
5+
update_type = "OS_UPDATE"
6+
}
7+
8+
data "oci_database_exadb_vm_cluster_update_history_entry" "test_exadb_vm_cluster_update_history_entry" {
9+
#Required
10+
exadb_vm_cluster_id = oci_database_exadb_vm_cluster.test_exadb_vm_cluster.id
11+
#Optional
12+
update_history_entry_id = data.oci_database_exadb_vm_cluster_update_history_entries.test_exadb_vm_cluster_update_history_entries.exadb_vm_cluster_update_history_entries[0].id
13+
}

‎examples/database/db_systems/db_exadbxs/exadb_vm_cluster_updates.tf

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
data "oci_database_exadb_vm_cluster_updates" "test_exadb_vm_cluster_updates" {
2+
#Required
3+
exadb_vm_cluster_id = oci_database_exadb_vm_cluster.test_exadb_vm_cluster.id
4+
#Optional
5+
update_type = "GI_PATCH"
6+
}
7+
8+
data "oci_database_exadb_vm_cluster_update" "test_exadb_vm_cluster_update" {
9+
#Required
10+
exadb_vm_cluster_id = oci_database_exadb_vm_cluster.test_exadb_vm_cluster.id
11+
update_id = data.oci_database_exadb_vm_cluster_updates.test_exadb_vm_cluster_updates.exadb_vm_cluster_updates[0].id
12+
}

‎examples/database/db_systems/db_exadbxs/exascale_db_storage_vault.tf

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
// Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
2+
// Licensed under the Mozilla Public License v2.0
3+
4+
resource "oci_database_exascale_db_storage_vault" "test_exascale_db_storage_vault" {
5+
#Required
6+
availability_domain = local.ad
7+
compartment_id = var.compartment_ocid
8+
display_name = "ExampleExascaleDbStorageVault"
9+
high_capacity_database_storage {
10+
total_size_in_gbs = 800
11+
}
12+
additional_flash_cache_in_percent = 20
13+
}
14+
15+
data "oci_database_exascale_db_storage_vaults" "test_exascale_db_storage_vaults" {
16+
#Required
17+
compartment_id = var.compartment_ocid
18+
}
19+
20+
data "oci_database_exascale_db_storage_vault" "test_exascale_db_storage_vault" {
21+
#Required
22+
exascale_db_storage_vault_id = oci_database_exascale_db_storage_vault.test_exascale_db_storage_vault.id
23+
}

‎examples/database/db_systems/db_exadbxs/network.tf

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
// Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
2+
// Licensed under the Mozilla Public License v2.0
3+
4+
resource "oci_core_virtual_network" "exadbxs_vcn" {
5+
compartment_id = var.compartment_ocid
6+
cidr_blocks = ["10.1.0.0/16"]
7+
display_name = "exadbxs-tf-vcn"
8+
dns_label = "tfvcn"
9+
}
10+
11+
resource "oci_core_internet_gateway" "exadbxs_igw" {
12+
compartment_id = var.compartment_ocid
13+
vcn_id = oci_core_virtual_network.exadbxs_vcn.id
14+
display_name = "exadbxs-tf-igw"
15+
}
16+
17+
resource "oci_core_route_table" "exadbxs_rt" {
18+
compartment_id = var.compartment_ocid
19+
vcn_id = oci_core_virtual_network.exadbxs_vcn.id
20+
display_name = "exadbxs-tf-route-table"
21+
route_rules {
22+
destination = "0.0.0.0/0"
23+
destination_type = "CIDR_BLOCK"
24+
network_entity_id = oci_core_internet_gateway.exadbxs_igw.id
25+
}
26+
}
27+
28+
resource "oci_core_subnet" "exadbxs_client_subnet" {
29+
cidr_block = "10.1.20.0/24"
30+
compartment_id = var.compartment_ocid
31+
vcn_id = oci_core_virtual_network.exadbxs_vcn.id
32+
route_table_id = oci_core_route_table.exadbxs_rt.id
33+
security_list_ids = [
34+
oci_core_virtual_network.exadbxs_vcn.default_security_list_id,
35+
oci_core_security_list.exadbxs_security_list.id
36+
]
37+
dns_label = "tfclientsub"
38+
display_name = "exadbxs-tf-client-subnet"
39+
}
40+
41+
resource "oci_core_subnet" "exadbxs_backup_subnet" {
42+
cidr_block = "10.1.21.0/24"
43+
compartment_id = var.compartment_ocid
44+
vcn_id = oci_core_virtual_network.exadbxs_vcn.id
45+
route_table_id = oci_core_route_table.exadbxs_rt.id
46+
dns_label = "tfbackupsub"
47+
display_name = "exadbxs-tf-backup-subnet"
48+
}
49+
50+
resource "oci_core_security_list" "exadbxs_security_list" {
51+
compartment_id = var.compartment_ocid
52+
vcn_id = oci_core_virtual_network.exadbxs_vcn.id
53+
display_name = "exadbxs-security-list"
54+
55+
ingress_security_rules {
56+
source = "10.1.22.0/24"
57+
protocol = "6"
58+
}
59+
60+
ingress_security_rules {
61+
source = "10.1.22.0/24"
62+
protocol = "1"
63+
}
64+
65+
ingress_security_rules {
66+
source = "10.1.22.0/24"
67+
protocol = "all"
68+
}
69+
70+
egress_security_rules {
71+
destination = "10.1.22.0/24"
72+
protocol = "6"
73+
}
74+
75+
egress_security_rules {
76+
destination = "10.1.22.0/24"
77+
protocol = "1"
78+
}
79+
}

0 commit comments

Comments
 (0)