Skip to content

Commit 3932734

Browse files
authored
Releasing version 4.53.0
Releasing version 4.53.0
2 parents 604b290 + 09b2e56 commit 3932734

File tree

11,299 files changed

+108909
-102425
lines changed

Some content is hidden

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

11,299 files changed

+108909
-102425
lines changed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
## 4.53.0 (Unreleased)
2+
3+
### Added
4+
- Support for Service Manager Proxy service
5+
- Support for Oracle Cloud Advisor v2
6+
- Support for TDE Wallet Password Optional for ExaCS and DBCS
7+
- Support for Encrypted FastConnect
8+
19
## 4.52.0 (November 10, 2021)
210

311
### Added
Lines changed: 345 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,345 @@
1+
// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
2+
// Licensed under the Mozilla Public License v2.0
3+
variable "tenancy_ocid" {
4+
}
5+
6+
variable "user_ocid" {
7+
}
8+
9+
variable "fingerprint" {
10+
}
11+
12+
variable "private_key_path" {
13+
}
14+
15+
variable "region" {
16+
}
17+
18+
variable "compartment_ocid" {
19+
}
20+
21+
variable "ssh_public_key" {
22+
}
23+
24+
variable "ssh_private_key" {
25+
}
26+
27+
# DBSystem specific
28+
variable "db_system_shape" {
29+
default = "VM.Standard2.1"
30+
}
31+
32+
variable "db_edition" {
33+
default = "ENTERPRISE_EDITION"
34+
}
35+
36+
variable "db_admin_password" {
37+
default = "BEstrO0ng_#12"
38+
}
39+
40+
variable "db_version" {
41+
default = "19.0.0.0"
42+
}
43+
44+
variable "db_disk_redundancy" {
45+
default = "NORMAL"
46+
}
47+
48+
variable "sparse_diskgroup" {
49+
default = true
50+
}
51+
52+
variable "hostname" {
53+
default = "myoracledb"
54+
}
55+
56+
variable "host_user_name" {
57+
default = "opc"
58+
}
59+
60+
variable "n_character_set" {
61+
default = "AL16UTF16"
62+
}
63+
64+
variable "character_set" {
65+
default = "AL32UTF8"
66+
}
67+
68+
variable "db_workload" {
69+
default = "OLTP"
70+
}
71+
72+
variable "pdb_name" {
73+
default = "pdbName"
74+
}
75+
76+
variable "data_storage_size_in_gb" {
77+
default = "256"
78+
}
79+
80+
variable "license_model" {
81+
default = "LICENSE_INCLUDED"
82+
}
83+
84+
variable "node_count" {
85+
default = "1"
86+
}
87+
88+
variable "test_database_software_image_ocid" {
89+
90+
}
91+
92+
provider "oci" {
93+
tenancy_ocid = var.tenancy_ocid
94+
user_ocid = var.user_ocid
95+
fingerprint = var.fingerprint
96+
private_key_path = var.private_key_path
97+
region = var.region
98+
}
99+
100+
data "oci_identity_availability_domain" "ad" {
101+
compartment_id = var.tenancy_ocid
102+
ad_number = 1
103+
}
104+
105+
# Get DB node list
106+
data "oci_database_db_nodes" "db_nodes" {
107+
compartment_id = var.compartment_ocid
108+
db_system_id = oci_database_db_system.test_db_system.id
109+
}
110+
111+
# Get DB node details
112+
data "oci_database_db_node" "db_node_details" {
113+
db_node_id = data.oci_database_db_nodes.db_nodes.db_nodes[0]["id"]
114+
}
115+
116+
# Gets the OCID of the first (default) vNIC
117+
#data "oci_core_vnic" "db_node_vnic" {
118+
# vnic_id = data.oci_database_db_node.db_node_details.vnic_id
119+
#}
120+
121+
data "oci_database_db_homes" "db_homes" {
122+
compartment_id = var.compartment_ocid
123+
db_system_id = oci_database_db_system.test_db_system.id
124+
}
125+
126+
data "oci_database_databases" "databases" {
127+
compartment_id = var.compartment_ocid
128+
db_home_id = data.oci_database_db_homes.db_homes.db_homes[0].db_home_id
129+
}
130+
131+
data "oci_database_db_versions" "test_db_versions_by_db_system_id" {
132+
compartment_id = var.compartment_ocid
133+
db_system_id = oci_database_db_system.test_db_system.id
134+
}
135+
136+
resource "oci_database_backup" "test_backup" {
137+
database_id = "${data.oci_database_databases.databases.databases.0.id}"
138+
display_name = "Monthly Backup"
139+
}
140+
141+
data "oci_database_db_system_shapes" "test_db_system_shapes" {
142+
availability_domain = data.oci_identity_availability_domain.ad.name
143+
compartment_id = var.compartment_ocid
144+
145+
filter {
146+
name = "shape"
147+
values = [var.db_system_shape]
148+
}
149+
}
150+
151+
data "oci_database_db_systems" "db_systems" {
152+
compartment_id = var.compartment_ocid
153+
154+
filter {
155+
name = "id"
156+
values = [oci_database_db_system.test_db_system.id]
157+
}
158+
}
159+
160+
resource "oci_core_vcn" "vcn" {
161+
cidr_block = "10.1.0.0/16"
162+
compartment_id = var.compartment_ocid
163+
display_name = "TFExampleVCNDBSystem"
164+
dns_label = "tfexvcndbsys"
165+
}
166+
167+
resource "oci_core_subnet" "subnet" {
168+
availability_domain = data.oci_identity_availability_domain.ad.name
169+
cidr_block = "10.1.20.0/24"
170+
display_name = "TFExampleSubnetDBSystem"
171+
dns_label = "tfexsubdbsys"
172+
security_list_ids = [oci_core_security_list.ExampleSecurityList.id]
173+
compartment_id = var.compartment_ocid
174+
vcn_id = oci_core_vcn.vcn.id
175+
route_table_id = oci_core_route_table.route_table.id
176+
dhcp_options_id = oci_core_vcn.vcn.default_dhcp_options_id
177+
}
178+
179+
resource "oci_core_subnet" "subnet_backup" {
180+
availability_domain = data.oci_identity_availability_domain.ad.name
181+
cidr_block = "10.1.1.0/24"
182+
display_name = "TFExampleSubnetDBSystemBackup"
183+
dns_label = "tfexsubdbsysbp"
184+
security_list_ids = [oci_core_security_list.ExampleSecurityList.id]
185+
compartment_id = var.compartment_ocid
186+
vcn_id = oci_core_vcn.vcn.id
187+
route_table_id = oci_core_route_table.route_table_backup.id
188+
dhcp_options_id = oci_core_vcn.vcn.default_dhcp_options_id
189+
}
190+
191+
resource "oci_core_internet_gateway" "internet_gateway" {
192+
compartment_id = var.compartment_ocid
193+
display_name = "TFExampleIGDBSystem"
194+
vcn_id = oci_core_vcn.vcn.id
195+
}
196+
197+
resource "oci_core_route_table" "route_table" {
198+
compartment_id = var.compartment_ocid
199+
vcn_id = oci_core_vcn.vcn.id
200+
display_name = "TFExampleRouteTableDBSystem"
201+
202+
route_rules {
203+
destination = "0.0.0.0/0"
204+
destination_type = "CIDR_BLOCK"
205+
network_entity_id = oci_core_internet_gateway.internet_gateway.id
206+
}
207+
}
208+
209+
resource "oci_core_route_table" "route_table_backup" {
210+
compartment_id = var.compartment_ocid
211+
vcn_id = oci_core_vcn.vcn.id
212+
display_name = "TFExampleRouteTableDBSystemBackup"
213+
214+
route_rules {
215+
destination = "0.0.0.0/0"
216+
destination_type = "CIDR_BLOCK"
217+
network_entity_id = oci_core_internet_gateway.internet_gateway.id
218+
}
219+
}
220+
221+
resource "oci_core_security_list" "ExampleSecurityList" {
222+
compartment_id = var.compartment_ocid
223+
vcn_id = oci_core_vcn.vcn.id
224+
display_name = "TFExampleSecurityList"
225+
226+
// allow outbound tcp traffic on all ports
227+
egress_security_rules {
228+
destination = "0.0.0.0/0"
229+
protocol = "6"
230+
}
231+
232+
// allow outbound udp traffic on a port range
233+
egress_security_rules {
234+
destination = "0.0.0.0/0"
235+
protocol = "17" // udp
236+
stateless = true
237+
}
238+
239+
egress_security_rules {
240+
destination = "0.0.0.0/0"
241+
protocol = "1"
242+
stateless = true
243+
}
244+
245+
// allow inbound ssh traffic from a specific port
246+
ingress_security_rules {
247+
protocol = "6" // tcp
248+
source = "0.0.0.0/0"
249+
stateless = false
250+
}
251+
252+
// allow inbound icmp traffic of a specific type
253+
ingress_security_rules {
254+
protocol = 1
255+
source = "0.0.0.0/0"
256+
stateless = true
257+
}
258+
}
259+
260+
resource "oci_core_network_security_group" "test_network_security_group" {
261+
compartment_id = var.compartment_ocid
262+
vcn_id = oci_core_vcn.vcn.id
263+
display_name = "displayName"
264+
}
265+
266+
resource "oci_core_network_security_group" "test_network_security_group_backup" {
267+
compartment_id = var.compartment_ocid
268+
vcn_id = oci_core_vcn.vcn.id
269+
display_name = "displayName"
270+
}
271+
272+
resource "oci_database_db_system" "test_db_system" {
273+
availability_domain = data.oci_identity_availability_domain.ad.name
274+
compartment_id = var.compartment_ocid
275+
database_edition = var.db_edition
276+
277+
db_home {
278+
database {
279+
admin_password = var.db_admin_password
280+
db_name = "aTFdbVm"
281+
character_set = var.character_set
282+
ncharacter_set = var.n_character_set
283+
db_workload = var.db_workload
284+
pdb_name = var.pdb_name
285+
286+
db_backup_config {
287+
auto_backup_enabled = false
288+
}
289+
}
290+
291+
db_version = var.db_version
292+
display_name = "MyTFDBHomeVm"
293+
}
294+
295+
db_system_options {
296+
storage_management = "LVM"
297+
}
298+
299+
disk_redundancy = var.db_disk_redundancy
300+
shape = var.db_system_shape
301+
subnet_id = oci_core_subnet.subnet.id
302+
ssh_public_keys = [var.ssh_public_key]
303+
display_name = "MyTFDBSystemVM"
304+
hostname = var.hostname
305+
data_storage_size_in_gb = var.data_storage_size_in_gb
306+
license_model = var.license_model
307+
node_count = data.oci_database_db_system_shapes.test_db_system_shapes.db_system_shapes[0]["minimum_node_count"]
308+
nsg_ids = [oci_core_network_security_group.test_network_security_group_backup.id, oci_core_network_security_group.test_network_security_group.id]
309+
310+
#To use defined_tags, set the values below to an existing tag namespace, refer to the identity example on how to create tag namespaces
311+
#defined_tags = {"${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}" = "value"}
312+
313+
freeform_tags = {
314+
"Department" = "Finance"
315+
}
316+
}
317+
318+
resource "oci_database_db_system" "db_system_bkup" {
319+
source = "DB_BACKUP"
320+
availability_domain = data.oci_identity_availability_domain.ad.name
321+
compartment_id = var.compartment_ocid
322+
subnet_id = oci_core_subnet.subnet.id
323+
database_edition = var.db_edition
324+
disk_redundancy = var.db_disk_redundancy
325+
shape = var.db_system_shape
326+
ssh_public_keys = [var.ssh_public_key]
327+
hostname = var.hostname
328+
data_storage_size_in_gb = var.data_storage_size_in_gb
329+
license_model = var.license_model
330+
node_count = data.oci_database_db_system_shapes.test_db_system_shapes.db_system_shapes[0]["minimum_node_count"]
331+
display_name = "tfDbSystemFromBackupWithCustImg"
332+
333+
db_home {
334+
db_version = "19.0.0.0"
335+
database_software_image_id = var.test_database_software_image_ocid
336+
database {
337+
admin_password = "BEstrO0ng_#11"
338+
339+
//comment below line, once KMS option is enabled for dbSystem. As backup_tde_password will be an optional parameter.
340+
backup_tde_password = "BEstrO0ng_#11"
341+
backup_id = "${oci_database_backup.test_backup.id}"
342+
db_name = "dbback"
343+
}
344+
}
345+
}

examples/fast_connect/cross_connect.tf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,5 @@ output "cross_connects" {
3333
value = data.oci_core_cross_connects.cross_connects.cross_connects
3434
}
3535

36+
37+

0 commit comments

Comments
 (0)