Skip to content

Commit 7e063cf

Browse files
neverdreamsneverdreams
authored
Release 3.19.0
Release 3.19.0
2 parents 10d02be + 2efc949 commit 7e063cf

File tree

111 files changed

+2709
-222
lines changed

Some content is hidden

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

111 files changed

+2709
-222
lines changed

‎CHANGELOG.md‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
## 3.18.1 (Unreleased)
1+
## 3.19.0 (Unreleased)
2+
3+
### Added
4+
- Support for cloning of Autonomous Databases
5+
- Support for node metadata in container engine node pool
6+
- Support for Data Guard Associations for databases
7+
28
## 3.18.0 (March 13, 2019)
39

410
### Added
@@ -81,7 +87,7 @@
8187

8288
### Note
8389
- Examples and test updated to use VM.Standard2.1
84-
- Windows example image updated to Windows-Server-2012-R2-Standard-Edition-VM-Gen2-2018.12.12-0
90+
- Windows example image updated to Windows-Server-2012-R2-Standard-Edition-VM-Gen2-2018.12.12-0
8591

8692
## 3.11.2 (January 10, 2019)
8793

‎docs/examples/budget/main.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ provider "oci" {
2323
resource "oci_budget_budget" "test_budget" {
2424
#Required
2525
amount = "1"
26-
compartment_id = "${var.compartment_ocid}"
26+
compartment_id = "${var.tenancy_ocid}"
2727
reset_period = "MONTHLY"
2828
target_compartment_id = "${var.compartment_ocid}"
2929

@@ -60,7 +60,7 @@ EOF
6060

6161
data "oci_budget_budgets" "test_budgets" {
6262
#Required
63-
compartment_id = "${var.compartment_ocid}"
63+
compartment_id = "${var.tenancy_ocid}"
6464

6565
#Optional
6666
// display_name = "${oci_budget_budget.test_budget.display_name}"

‎docs/examples/database/dataguard/bm_shape/dataguard.tf‎

Lines changed: 142 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,142 @@
1+
// Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
2+
3+
variable "tenancy_ocid" {}
4+
variable "user_ocid" {}
5+
variable "fingerprint" {}
6+
variable "private_key_path" {}
7+
variable "compartment_ocid" {}
8+
variable "region" {}
9+
10+
variable "ssh_public_key" {}
11+
12+
provider "oci" {
13+
tenancy_ocid = "${var.tenancy_ocid}"
14+
user_ocid = "${var.user_ocid}"
15+
fingerprint = "${var.fingerprint}"
16+
private_key_path = "${var.private_key_path}"
17+
region = "${var.region}"
18+
}
19+
20+
data "oci_identity_availability_domain" "ad" {
21+
compartment_id = "${var.tenancy_ocid}"
22+
ad_number = 1
23+
}
24+
25+
resource "oci_core_virtual_network" "vcn1" {
26+
cidr_block = "10.0.0.0/16"
27+
compartment_id = "${var.compartment_ocid}"
28+
display_name = "TFExampleVCN"
29+
dns_label = "tfexamplevcn"
30+
}
31+
32+
resource "oci_core_security_list" "test_security_list" {
33+
compartment_id = "${var.compartment_ocid}"
34+
vcn_id = "${oci_core_virtual_network.vcn1.id}"
35+
display_name = "TFExampleSecurityList"
36+
37+
// allow outbound tcp traffic on all ports
38+
egress_security_rules {
39+
destination = "0.0.0.0/0"
40+
protocol = "6"
41+
}
42+
43+
ingress_security_rules {
44+
protocol = "6"
45+
source = "0.0.0.0/0"
46+
}
47+
}
48+
49+
// An AD based subnet will supply an Availability Domain
50+
resource "oci_core_subnet" "test_subnet" {
51+
availability_domain = "${data.oci_identity_availability_domain.ad.name}"
52+
cidr_block = "10.0.2.0/24"
53+
display_name = "TFADSubnet"
54+
dns_label = "adsubnet"
55+
compartment_id = "${var.compartment_ocid}"
56+
vcn_id = "${oci_core_virtual_network.vcn1.id}"
57+
security_list_ids = ["${oci_core_security_list.test_security_list.id}"]
58+
route_table_id = "${oci_core_virtual_network.vcn1.default_route_table_id}"
59+
dhcp_options_id = "${oci_core_virtual_network.vcn1.default_dhcp_options_id}"
60+
}
61+
62+
resource "oci_database_db_system" "test_db_system" {
63+
availability_domain = "${oci_core_subnet.test_subnet.availability_domain}"
64+
compartment_id = "${var.compartment_ocid}"
65+
subnet_id = "${oci_core_subnet.test_subnet.id}"
66+
database_edition = "ENTERPRISE_EDITION"
67+
disk_redundancy = "NORMAL"
68+
shape = "BM.DenseIO2.52"
69+
cpu_core_count = "2"
70+
ssh_public_keys = ["${var.ssh_public_key}"]
71+
domain = "${oci_core_subnet.test_subnet.subnet_domain_name}"
72+
hostname = "myOracleDB"
73+
data_storage_size_in_gb = "256"
74+
license_model = "LICENSE_INCLUDED"
75+
node_count = "1"
76+
display_name = "TFExampleDbSystem1"
77+
78+
db_home {
79+
db_version = "12.1.0.2"
80+
display_name = "TFExampleDbHome1"
81+
82+
database {
83+
"admin_password" = "BEstrO0ng_#11"
84+
"db_name" = "tfDbName"
85+
}
86+
}
87+
}
88+
89+
data "oci_database_db_homes" "t" {
90+
compartment_id = "${var.compartment_ocid}"
91+
db_system_id = "${oci_database_db_system.test_db_system.id}"
92+
93+
filter {
94+
name = "display_name"
95+
values = ["TFExampleDbHome1"]
96+
}
97+
}
98+
99+
resource "oci_database_db_system" "test_db_system2" {
100+
availability_domain = "${oci_core_subnet.test_subnet.availability_domain}"
101+
compartment_id = "${var.compartment_ocid}"
102+
subnet_id = "${oci_core_subnet.test_subnet.id}"
103+
database_edition = "ENTERPRISE_EDITION"
104+
disk_redundancy = "NORMAL"
105+
shape = "BM.DenseIO2.52"
106+
cpu_core_count = "2"
107+
ssh_public_keys = ["${var.ssh_public_key}"]
108+
domain = "${oci_core_subnet.test_subnet.subnet_domain_name}"
109+
hostname = "myOracleDB"
110+
data_storage_size_in_gb = "256"
111+
license_model = "LICENSE_INCLUDED"
112+
node_count = "1"
113+
display_name = "TFExampleDbSystem2"
114+
115+
db_home {
116+
db_version = "12.1.0.2"
117+
display_name = "dbHome1"
118+
119+
database {
120+
"admin_password" = "BEstrO0ng_#11"
121+
"db_name" = "db2"
122+
}
123+
}
124+
}
125+
126+
data "oci_database_databases" "db" {
127+
compartment_id = "${var.compartment_ocid}"
128+
db_home_id = "${data.oci_database_db_homes.t.db_homes.0.db_home_id}"
129+
}
130+
131+
resource "oci_database_data_guard_association" "test_data_guard_association" {
132+
#Required
133+
creation_type = "ExistingDbSystem"
134+
database_admin_password = "BEstrO0ng_#11"
135+
database_id = "${data.oci_database_databases.db.databases.0.id}"
136+
protection_mode = "MAXIMUM_PERFORMANCE"
137+
transport_type = "ASYNC"
138+
delete_standby_db_home_on_delete = "true"
139+
140+
#required for ExistingDbSystem creation_type
141+
peer_db_system_id = "${oci_database_db_system.test_db_system2.id}"
142+
}

‎docs/examples/database/dataguard/vm_shape/dataguard.tf‎

Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
1+
// Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
2+
3+
variable "tenancy_ocid" {}
4+
variable "user_ocid" {}
5+
variable "fingerprint" {}
6+
variable "private_key_path" {}
7+
variable "compartment_ocid" {}
8+
variable "region" {}
9+
10+
variable "ssh_public_key" {}
11+
12+
provider "oci" {
13+
tenancy_ocid = "${var.tenancy_ocid}"
14+
user_ocid = "${var.user_ocid}"
15+
fingerprint = "${var.fingerprint}"
16+
private_key_path = "${var.private_key_path}"
17+
region = "${var.region}"
18+
}
19+
20+
data "oci_identity_availability_domain" "ad" {
21+
compartment_id = "${var.tenancy_ocid}"
22+
ad_number = 1
23+
}
24+
25+
resource "oci_core_virtual_network" "vcn1" {
26+
cidr_block = "10.0.0.0/16"
27+
compartment_id = "${var.compartment_ocid}"
28+
display_name = "TFExampleVCN"
29+
dns_label = "tfexamplevcn"
30+
}
31+
32+
resource "oci_core_security_list" "test_security_list" {
33+
compartment_id = "${var.compartment_ocid}"
34+
vcn_id = "${oci_core_virtual_network.vcn1.id}"
35+
display_name = "TFExampleSecurityList"
36+
37+
// allow outbound tcp traffic on all ports
38+
egress_security_rules {
39+
destination = "0.0.0.0/0"
40+
protocol = "6"
41+
}
42+
43+
ingress_security_rules {
44+
protocol = "6"
45+
source = "0.0.0.0/0"
46+
}
47+
}
48+
49+
// An AD based subnet will supply an Availability Domain
50+
resource "oci_core_subnet" "test_subnet" {
51+
availability_domain = "${data.oci_identity_availability_domain.ad.name}"
52+
cidr_block = "10.0.2.0/24"
53+
display_name = "TFADSubnet"
54+
dns_label = "adsubnet"
55+
compartment_id = "${var.compartment_ocid}"
56+
vcn_id = "${oci_core_virtual_network.vcn1.id}"
57+
security_list_ids = ["${oci_core_security_list.test_security_list.id}"]
58+
route_table_id = "${oci_core_virtual_network.vcn1.default_route_table_id}"
59+
dhcp_options_id = "${oci_core_virtual_network.vcn1.default_dhcp_options_id}"
60+
}
61+
62+
resource "oci_database_db_system" "test_db_system" {
63+
availability_domain = "${oci_core_subnet.test_subnet.availability_domain}"
64+
compartment_id = "${var.compartment_ocid}"
65+
subnet_id = "${oci_core_subnet.test_subnet.id}"
66+
database_edition = "ENTERPRISE_EDITION"
67+
disk_redundancy = "NORMAL"
68+
shape = "VM.Standard2.1"
69+
ssh_public_keys = ["${var.ssh_public_key}"]
70+
domain = "${oci_core_subnet.test_subnet.subnet_domain_name}"
71+
hostname = "myOracleDB"
72+
data_storage_size_in_gb = "256"
73+
license_model = "LICENSE_INCLUDED"
74+
node_count = "1"
75+
display_name = "TFExampleDbSystem"
76+
77+
db_home {
78+
db_version = "12.1.0.2"
79+
display_name = "TFExampleDbHome"
80+
81+
database {
82+
"admin_password" = "BEstrO0ng_#11"
83+
"db_name" = "db1"
84+
}
85+
}
86+
}
87+
88+
data "oci_database_db_homes" "t" {
89+
compartment_id = "${var.compartment_ocid}"
90+
db_system_id = "${oci_database_db_system.test_db_system.id}"
91+
92+
filter {
93+
name = "display_name"
94+
values = ["TFExampleDbHome"]
95+
}
96+
}
97+
98+
data "oci_database_databases" "db" {
99+
compartment_id = "${var.compartment_ocid}"
100+
db_home_id = "${data.oci_database_db_homes.t.db_homes.0.db_home_id}"
101+
}
102+
103+
resource "oci_database_data_guard_association" "test_data_guard_association" {
104+
#Required
105+
creation_type = "NewDbSystem"
106+
database_admin_password = "BEstrO0ng_#11"
107+
database_id = "${data.oci_database_databases.db.databases.0.id}"
108+
protection_mode = "MAXIMUM_PERFORMANCE"
109+
transport_type = "ASYNC"
110+
delete_standby_db_home_on_delete = "true"
111+
112+
#required for NewDbSystem creation_type
113+
display_name = "TFExampleDataGuardAssociationVM"
114+
subnet_id = "${oci_core_subnet.test_subnet.id}"
115+
availability_domain = "${oci_core_subnet.test_subnet.availability_domain}"
116+
hostname = "ocidb"
117+
}

‎docs/examples/db_systems/README.md‎ renamed to ‎docs/examples/database/db_systems/README.md‎

File renamed without changes.

‎docs/examples/db_systems/datasources.tf‎ renamed to ‎docs/examples/database/db_systems/datasources.tf‎

File renamed without changes.

‎docs/examples/db_systems/db_exadata/datasources.tf‎ renamed to ‎docs/examples/database/db_systems/db_exadata/datasources.tf‎

File renamed without changes.

‎docs/examples/db_systems/db_exadata/network.tf‎ renamed to ‎docs/examples/database/db_systems/db_exadata/network.tf‎

File renamed without changes.

‎docs/examples/db_systems/db_exadata/provider.tf‎ renamed to ‎docs/examples/database/db_systems/db_exadata/provider.tf‎

File renamed without changes.

‎docs/examples/db_systems/db_exadata/resources.tf‎ renamed to ‎docs/examples/database/db_systems/db_exadata/resources.tf‎

File renamed without changes.

0 commit comments

Comments
 (0)