Skip to content

Commit 1de1f6a

Browse files
MaxrovrMaxrovr
authored
Merge pull request #1713 from oracle/release_gh
Releasing version 4.100.0
2 parents b0e3470 + 9919a3c commit 1de1f6a

File tree

782 files changed

+23008
-571
lines changed

Some content is hidden

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

782 files changed

+23008
-571
lines changed

‎CHANGELOG.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
## 4.100.0 (November 16, 2022)
2+
3+
### Added
4+
- Support for mTLS and Scan port configuration of AVM Clusters on ExaCC
5+
- Support for Dev and Deployment of Site Guard as Service in OCI
6+
### Bug Fix
7+
- auto_backup_window field is not updated for dbSystem / database resource
8+
19
## 4.99.0 (November 09, 2022)
210

311
### Added
@@ -1083,7 +1091,7 @@ as source using `vm_cluster_id` and `SOURCE=VM_CLUSTER_NEW`.
10831091

10841092
### Notes
10851093
- Upgrade to Terraform Plugin SDK v1.15.0
1086-
- Resource discovery now requires Terraform CLI. For more details on how to provide the CLI, refer to [resource discovery prerequisites](https://registry.terraform.io/providers/hashicorp/oci/latest/docs/guides/resource_discovery#prerequisites)
1094+
- Resource discovery now requires Terraform CLI. For more details on how to provide the CLI, refer to [resource discovery prerequisites](https://registry.terraform.io/providers/oracle/oci/latest/docs/guides/resource_discovery#prerequisites)
10871095

10881096
## 3.97.0 (October 14, 2020)
10891097

‎examples/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ This directory contains Terraform configuration files showing how to create spec
7373
[![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/datascience.zip)
7474
- devops
7575
[![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/devops.zip)
76+
- disaster_recovery
77+
[![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/disaster_recovery.zip)
7678
- dns
7779
[![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/dns.zip)
7880
- em_warehouse

‎examples/database/exadata_cc/adbd-dg/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ resource "oci_database_exadata_infrastructure" "primary_exadata_infrastructure"
5555
netmask = "255.255.255.0"
5656
ntp_server = [
5757
"10.231.225.76"]
58-
shape = "ExadataCC.Quarter3.100"
58+
shape = "ExadataCC.X7"
5959
time_zone = "US/Pacific"
6060
}
6161

@@ -81,7 +81,7 @@ resource "oci_database_exadata_infrastructure" "standby_exadata_infrastructure"
8181
netmask = "255.255.255.0"
8282
ntp_server = [
8383
"10.231.225.76"]
84-
shape = "ExadataCC.Quarter3.100"
84+
shape = "ExadataCC.X7"
8585
time_zone = "US/Pacific"
8686
}
8787

‎examples/database/exadata_cc/adbd/autonomous_vm_cluster.tf

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,17 @@ resource "oci_database_autonomous_vm_cluster" "test_autonomous_vm_cluster" {
77
display_name = "autonomousVmCluster"
88
exadata_infrastructure_id = oci_database_exadata_infrastructure.test_exadata_infrastructure.id
99
vm_cluster_network_id = oci_database_vm_cluster_network.test_vm_cluster_network.id
10-
cpu_core_count_per_node = "6"
11-
autonomous_data_storage_size_in_tbs = "1.0"
10+
cpu_core_count_per_node = "10"
11+
autonomous_data_storage_size_in_tbs = "2.0"
1212
memory_per_oracle_compute_unit_in_gbs = "12"
1313
total_container_databases = "2"
1414
#Optional
1515
is_local_backup_enabled = "false"
1616
license_model = "LICENSE_INCLUDED"
1717
time_zone = "US/Pacific"
18+
is_mtls_enabled = "true"
19+
scan_listener_port_tls = "3600"
20+
scan_listener_port_non_tls = "1600"
1821
defined_tags = {
1922
"${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}" = "value"
2023
}
@@ -30,8 +33,8 @@ resource "oci_database_autonomous_vm_cluster" "autonomous_vm_cluster_2" {
3033
display_name = "peerAutonomousVmCluster"
3134
exadata_infrastructure_id = oci_database_exadata_infrastructure.test_exadata_infrastructure.id
3235
vm_cluster_network_id = oci_database_vm_cluster_network.test_vm_cluster_network2.id
33-
cpu_core_count_per_node = "6"
34-
autonomous_data_storage_size_in_tbs = "1.0"
36+
cpu_core_count_per_node = "10"
37+
autonomous_data_storage_size_in_tbs = "2.0"
3538
memory_per_oracle_compute_unit_in_gbs = "12"
3639
total_container_databases = "2"
3740
#Optional

‎examples/database/exadata_cc/adbd/exadata-infrastructure.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ resource "oci_database_exadata_infrastructure" "test_exadata_infrastructure" {
4040
infini_band_network_cidr = "10.31.8.0/21"
4141
netmask = "255.255.255.0"
4242
ntp_server = ["10.231.225.76"]
43-
shape = "ExadataCC.Quarter3.100"
43+
shape = "ExadataCC.X7"
4444
time_zone = "US/Pacific"
4545
activation_file = local_file.activation_file.filename
4646
storage_count = 3
@@ -91,7 +91,7 @@ resource "oci_database_exadata_infrastructure" "test_exadata_infrastructure" {
9191

9292
weeks_of_month = ["2"]
9393
}
94-
94+
9595
}
9696

9797

‎examples/database/exadata_cc/adbd/vmcluster_network.tf

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,13 @@ resource "oci_database_vm_cluster_network" "test_vm_cluster_network" {
2929
nodes {
3030
hostname = "myprefix2-cghdm1"
3131
ip = "192.169.19.18"
32+
db_server_id = data.oci_database_db_servers.test_db_servers.db_servers.0.id
3233
}
3334

3435
nodes {
3536
hostname = "myprefix2-cghdm2"
3637
ip = "192.169.19.20"
38+
db_server_id = data.oci_database_db_servers.test_db_servers.db_servers.1.id
3739
}
3840

3941
vlan_id = "11"
@@ -50,13 +52,15 @@ resource "oci_database_vm_cluster_network" "test_vm_cluster_network" {
5052
ip = "192.168.19.10"
5153
vip = "192.168.19.11"
5254
vip_hostname = "myprefix1-r64zc1-vip"
55+
db_server_id = data.oci_database_db_servers.test_db_servers.db_servers.0.id
5356
}
5457

5558
nodes {
5659
hostname = "myprefix1-r64zc2"
5760
ip = "192.168.19.14"
5861
vip = "192.168.19.15"
5962
vip_hostname = "myprefix1-r64zc2-vip"
63+
db_server_id = data.oci_database_db_servers.test_db_servers.db_servers.1.id
6064
}
6165

6266
vlan_id = "10"
@@ -72,6 +76,12 @@ resource "oci_database_vm_cluster_network" "test_vm_cluster_network" {
7276
}
7377

7478
validate_vm_cluster_network = true
79+
action = "ADD_DBSERVER_NETWORK"
80+
lifecycle {
81+
ignore_changes = [
82+
vm_networks,
83+
]
84+
}
7585
}
7686

7787
resource "oci_database_vm_cluster_network" "test_vm_cluster_network2" {
@@ -105,11 +115,13 @@ resource "oci_database_vm_cluster_network" "test_vm_cluster_network2" {
105115
nodes {
106116
hostname = "myprefix3-cghdm1"
107117
ip = "192.169.19.48"
118+
db_server_id = data.oci_database_db_servers.test_db_servers.db_servers.0.id
108119
}
109120

110121
nodes {
111122
hostname = "myprefix3-cghdm2"
112123
ip = "192.169.19.50"
124+
db_server_id = data.oci_database_db_servers.test_db_servers.db_servers.1.id
113125
}
114126

115127
vlan_id = "21"
@@ -126,13 +138,15 @@ resource "oci_database_vm_cluster_network" "test_vm_cluster_network2" {
126138
ip = "192.168.19.50"
127139
vip = "192.168.19.51"
128140
vip_hostname = "myprefix4-r64zc1-vip"
141+
db_server_id = data.oci_database_db_servers.test_db_servers.db_servers.0.id
129142
}
130143

131144
nodes {
132145
hostname = "myprefix4-r64zc2"
133146
ip = "192.168.19.54"
134147
vip = "192.168.19.55"
135148
vip_hostname = "myprefix4-r64zc2-vip"
149+
db_server_id = data.oci_database_db_servers.test_db_servers.db_servers.1.id
136150
}
137151

138152
vlan_id = "40"
@@ -148,4 +162,16 @@ resource "oci_database_vm_cluster_network" "test_vm_cluster_network2" {
148162
}
149163

150164
validate_vm_cluster_network = true
165+
action = "ADD_DBSERVER_NETWORK"
166+
lifecycle {
167+
ignore_changes = [
168+
vm_networks,
169+
]
170+
}
171+
}
172+
173+
data "oci_database_db_servers" "test_db_servers" {
174+
#Required
175+
compartment_id = var.compartment_ocid
176+
exadata_infrastructure_id = oci_database_exadata_infrastructure.test_exadata_infrastructure.id
151177
}

‎examples/database/exadata_cc/autonomous_vm_cluster.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ resource "oci_database_autonomous_vm_cluster" "test_autonomous_vm_cluster" {
66
display_name = "autonomousVmCluster"
77
exadata_infrastructure_id = oci_database_exadata_infrastructure.test_exadata_infrastructure.id
88
vm_cluster_network_id = oci_database_vm_cluster_network.test_vm_cluster_network.id
9-
cpu_core_count_per_node = "6"
10-
autonomous_data_storage_size_in_tbs = "1.0"
9+
cpu_core_count_per_node = "10"
10+
autonomous_data_storage_size_in_tbs = "2.0"
1111
memory_per_oracle_compute_unit_in_gbs = "12"
1212
total_container_databases = "2"
1313
#Optional

‎examples/disaster_recovery/README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Overview
2+
This is a Terraform configuration that creates the `disaster_recovery` service on Oracle Cloud Infrastructure.
3+
4+
The Terraform code is used to create a Resource Manager stack, that creates the required resources and configures the application on the created resources.
5+
## Magic Button
6+
[![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/disaster_recovery.zip)

‎examples/disaster_recovery/description.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Overview
2+
This is a Terraform configuration that creates the `disaster_recovery` service on Oracle Cloud Infrastructure.
3+
4+
The Terraform code is used to create a Resource Manager stack, that creates the required resources and configures the application on the created resources.

‎examples/disaster_recovery/dr_plan/bucket.tf

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
variable "bucket_name" {
2+
default = "testBucketName_2"
3+
}
4+
5+
variable "bucket_namespace" {
6+
default = "ansh8lvru1zp"
7+
}
8+
9+
data "oci_identity_tenancy" "test_tenancy" {
10+
#Required
11+
tenancy_id = var.tenancy_ocid
12+
}
13+
14+
data "oci_objectstorage_namespace" "test_namespace" {
15+
16+
#Optional
17+
compartment_id = var.compartment_id
18+
}
19+
20+
resource "oci_objectstorage_bucket" "test_bucket" {
21+
#Required
22+
compartment_id = var.compartment_id
23+
name = var.bucket_name
24+
namespace = data.oci_objectstorage_namespace.test_namespace.namespace
25+
}

0 commit comments

Comments
 (0)