Skip to content

Commit d224d50

Browse files
sagarp337sagarp337
authored
Merge pull request #1956 from oracle/release_gh
Releasing version 5.12.0
2 parents 6c03c0b + b7036c6 commit d224d50

File tree

259 files changed

+3731
-412
lines changed

Some content is hidden

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

259 files changed

+3731
-412
lines changed

‎CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## 5.12.0 (September 06, 2023)
2+
3+
### Added
4+
- Support for Terraform for Serial Console Phase 1 ExaDB-C@C (EXACC) Serial Console Access to VM
5+
- Support for refreshing security token auth
6+
17
## 5.11.0 (August 30, 2023)
28

39
### Added

‎examples/database/exadata_cc_console_connection/activation.zip

Whitespace-only changes.

‎examples/database/exadata_cc_console_connection/db_node.tf

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
// Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
2+
// Licensed under the Mozilla Public License v2.0
3+
//variable "compartment_id" {}
4+
5+
variable "db_node_state" {
6+
default = "AVAILABLE"
7+
}
8+
9+
variable "public_key" {
10+
default = "ssh-rsa KKKLK3NzaC1yc2EAAAADAQABAAABAQC+UC9MFNA55NIVtKPIBCNw7++ACXhD0hx+Zyj25JfHykjz/QU3Q5FAU3DxDbVXyubgXfb/GJnrKRY8O4QDdvnZZRvQFFEOaApThAmCAM5MuFUIHdFvlqP+0W+ZQnmtDhwVe2NCfcmOrMuaPEgOKO3DOW6I/qOOdO691Xe2S9NgT9HhN0ZfFtEODVgvYulgXuCCXsJs+NUqcHAOxxFUmwkbPvYi0P0e2DT8JKeiOOC8VKUEgvVx+GKmqasm+Y6zHFW7vv3g2GstE1aRs3mttHRoC/JPM86PRyIxeWXEMzyG5wHqUu4XZpDbnWNxi6ugxnAGiL3CrIFdCgRNgHz5qS1l MustWin"
11+
}
12+
13+
resource "oci_database_db_node" "test_db_node" {
14+
#Required
15+
db_node_id = data.oci_database_db_nodes.test_db_nodes.db_nodes[0]["id"]
16+
17+
#Optional
18+
defined_tags = {
19+
"${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}" = "updatedvalue"
20+
}
21+
22+
freeform_tags = {
23+
"Department" = "Accounting"
24+
}
25+
}
26+
27+
data "oci_database_db_nodes" "test_db_nodes" {
28+
#Required
29+
compartment_id = var.compartment_ocid
30+
31+
#Optional
32+
db_server_id = data.oci_database_db_servers.test_db_servers.db_servers.0.id
33+
state = var.db_node_state
34+
vm_cluster_id = oci_database_vm_cluster.test_vm_cluster.id
35+
}
36+
37+
38+
output "test_db_node_value" {
39+
value = data.oci_database_db_nodes.test_db_nodes.db_nodes
40+
}
41+
42+
output "test_db_node_value1" {
43+
value = data.oci_database_db_nodes.test_db_nodes.db_nodes[0]["id"]
44+
}

‎examples/database/exadata_cc_console_connection/db_node_console_connection.tf

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
// Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
2+
// Licensed under the Mozilla Public License v2.0
3+
variable "db_node_console_connection_public_key" {
4+
default = "ssh-rsa KKKLK3NzaC1yc2EAAAADAQABAAABAQC+UC9MFNA55NIVtKPIBCNw7++ACXhD0hx+Zyj25JfHykjz/QU3Q5FAU3DxDbVXyubgXfb/GJnrKRY8O4QDdvnZZRvQFFEOaApThAmCAM5MuFUIHdFvlqP+0W+ZQnmtDhwVe2NCfcmOrMuaPEgOKO3DOW6I/qOOdO691Xe2S9NgT9HhN0ZfFtEODVgvYulgXuCCXsJs+NUqcHAOxxFUmwkbPvYi0P0e2DT8JKeiOOC8VKUEgvVx+GKmqasm+Y6zHFW7vv3g2GstE1aRs3mttHRoC/JPM86PRyIxeWXEMzyG5wHqUu4XZpDbnWNxi6ugxnAGiL3CrIFdCgRNgHz5qS1l MustWin"
5+
}
6+
7+
8+
resource "oci_database_db_node_console_connection" "test_db_node_console_connection" {
9+
#Required
10+
db_node_id = data.oci_database_db_nodes.test_db_nodes.db_nodes[0]["id"]
11+
public_key = var.db_node_console_connection_public_key
12+
13+
#Optional
14+
defined_tags = {
15+
"${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}" = "updatedvalue"
16+
}
17+
18+
freeform_tags = {
19+
"Department" = "Accounting"
20+
}
21+
}
22+
23+
data "oci_database_db_node_console_connections" "test_db_node_console_connections" {
24+
#Required
25+
db_node_id = oci_database_db_node.test_db_node.id
26+
}

‎examples/database/exadata_cc_console_connection/exadata-infrastructure.tf

Lines changed: 148 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,148 @@
1+
// Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
2+
// Licensed under the Mozilla Public License v2.0
3+
4+
variable "tenancy_ocid" {
5+
}
6+
7+
variable "user_ocid" {
8+
}
9+
10+
variable "fingerprint" {
11+
}
12+
13+
variable "private_key_path" {
14+
}
15+
16+
variable "region" {
17+
}
18+
19+
variable "compartment_ocid" {
20+
}
21+
22+
variable "ssh_public_key" {
23+
default = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCoUma91jRZV5yeAv46/JRFbd7t7J+yfopdvhh+aO3e7IFpQymdiWaTXFbONJnAqIGP90ux5icYEoNNTkcD1uf+kN/nPBjtUkla2PGNsZOkNFkQTVQxqHnGuLznP259MhCpWDXPnuwYGbsTT0LodWh9nq1v52viL7D/R6GJSz63IkgKqVebuSbqA+51hNwcpDic8MQ19Ilb0Z+sY7bGZnR2GTFNa6Bm9UGWAArOZ4ER453CmN96lX3KbimI6iW85Eny4OCndwOjK25JHXI4A7K3GVMoplyJtjBM5ExC7Xt3/L3yDNiF3oZbdHd3OQtmjajQeub2NlVU6+8AQJK/ecODQ7+S6DTZuPUma5KLEOMDXjrzYjXbBEkZaxu7kQK+KBIdhqSpkeZUr4OB+Qumd9B/WjMJOzLGLt1uJ2x7lgKlrDIfXAwWYm1cHEE0K7kDVFLtGEayF6E4cIHw70OoOyq6CSxaphkIFvsBYFfFx1rc8w1upKokzi489ij53mY/r8M= casey.pham@oracle.com"
24+
}
25+
26+
provider "oci" {
27+
auth = "SecurityToken"
28+
config_file_profile = "terraform-federation-test"
29+
region = var.region
30+
}
31+
32+
resource "oci_database_exadata_infrastructure" "test_exadata_infrastructure" {
33+
#Required
34+
admin_network_cidr = "192.168.0.0/16"
35+
cloud_control_plane_server1 = "10.32.88.1"
36+
cloud_control_plane_server2 = "10.32.88.3"
37+
compartment_id = var.compartment_ocid
38+
display_name = "tstExaInfra"
39+
dns_server = ["10.231.225.65"]
40+
gateway = "10.32.88.5"
41+
infini_band_network_cidr = "10.31.8.0/21"
42+
netmask = "255.255.255.0"
43+
ntp_server = ["10.231.225.76"]
44+
shape = "ExadataCC.X7"
45+
time_zone = "US/Pacific"
46+
activation_file = "activation.zip"
47+
storage_count = 3
48+
compute_count = 2
49+
is_cps_offline_report_enabled = false
50+
is_multi_rack_deployment = false
51+
52+
#Optional
53+
network_bonding_mode_details {
54+
backup_network_bonding_mode = "ACTIVE_BACKUP"
55+
client_network_bonding_mode = "ACTIVE_BACKUP"
56+
}
57+
58+
#Optional
59+
contacts {
60+
email = "testuser2@testdomain.com"
61+
is_primary = "true"
62+
name = "name"
63+
phone_number = "1234567891"
64+
}
65+
66+
corporate_proxy = "http://192.168.19.1:80"
67+
defined_tags = {
68+
"${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}" = "updatedvalue"
69+
}
70+
71+
freeform_tags = {
72+
"Department" = "Accounting"
73+
}
74+
75+
maintenance_window {
76+
preference = "CUSTOM_PREFERENCE"
77+
78+
days_of_week {
79+
name = "TUESDAY"
80+
}
81+
82+
hours_of_day = ["4"]
83+
lead_time_in_weeks = 2
84+
85+
months {
86+
name = "JANUARY"
87+
}
88+
89+
months {
90+
name = "APRIL"
91+
}
92+
93+
months {
94+
name = "JULY"
95+
}
96+
97+
months {
98+
name = "OCTOBER"
99+
}
100+
101+
weeks_of_month = ["2"]
102+
103+
patching_mode = "ROLLING"
104+
105+
is_custom_action_timeout_enabled = true
106+
107+
custom_action_timeout_in_mins = 30
108+
}
109+
110+
}
111+
112+
data "oci_database_exadata_infrastructure_download_config_file" "test_exadata_infrastructure_download_config_file" {
113+
#Required
114+
exadata_infrastructure_id = oci_database_exadata_infrastructure.test_exadata_infrastructure.id
115+
116+
#Optional
117+
base64_encode_content = true
118+
}
119+
120+
data "oci_database_exadata_infrastructures" "test_exadata_infrastructures" {
121+
#Required
122+
compartment_id = var.compartment_ocid
123+
}
124+
125+
resource "oci_identity_tag_namespace" "tag-namespace1" {
126+
#Required
127+
compartment_id = var.tenancy_ocid
128+
description = "tagNamespace1"
129+
name = "testexamples-tag-namespace1"
130+
}
131+
132+
resource "oci_identity_tag" "tag1" {
133+
#Required
134+
description = "tf example tag"
135+
name = "tf-example-tag"
136+
tag_namespace_id = oci_identity_tag_namespace.tag-namespace1.id
137+
}
138+
139+
data "oci_identity_availability_domain" "ad" {
140+
compartment_id = var.tenancy_ocid
141+
ad_number = 1
142+
}
143+
144+
resource "local_file" "test_exadata_infrastructure_downloaded_config_file" {
145+
content = data.oci_database_exadata_infrastructure_download_config_file.test_exadata_infrastructure_download_config_file.content
146+
filename = "${path.module}/exadata_infrastructure_config.zip"
147+
}
148+

‎examples/database/exadata_cc_console_connection/multi_rack_sar_file_storage.json

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
{
2+
"generation" : "X8M",
3+
"total racks" : 2,
4+
"total compute" : 2,
5+
"total storage" : 10,
6+
"total existing racks" : 1,
7+
"total existing compute" : 2,
8+
"total existing storage" : 3,
9+
"racks" :
10+
[
11+
{
12+
"rack_num" : 1,
13+
"new rack" : "yes",
14+
"number compute" : 0,
15+
"number storage" : 7,
16+
"existing compute" : 0,
17+
"existing storage" : 0,
18+
"components" :
19+
[
20+
{
21+
"type" : "spine",
22+
"uloc" : 1,
23+
"uheight" : 1,
24+
"new component" : "yes"
25+
},
26+
{
27+
"type" : "storage",
28+
"uloc" : 2,
29+
"uheight" : 2,
30+
"new component" : "yes"
31+
},
32+
{
33+
"type" : "storage",
34+
"uloc" : 4,
35+
"uheight" : 2,
36+
"new component" : "yes"
37+
},
38+
{
39+
"type" : "storage",
40+
"uloc" : 6,
41+
"uheight" : 2,
42+
"new component" : "yes"
43+
},
44+
{
45+
"type" : "storage",
46+
"uloc" : 8,
47+
"uheight" : 2,
48+
"new component" : "yes"
49+
},
50+
{
51+
"type" : "storage",
52+
"uloc" : 10,
53+
"uheight" : 2,
54+
"new component" : "yes"
55+
},
56+
{
57+
"type" : "storage",
58+
"uloc" : 12,
59+
"uheight" : 2,
60+
"new component" : "yes"
61+
},
62+
{
63+
"type" : "storage",
64+
"uloc" : 14,
65+
"uheight" : 2,
66+
"new component" : "yes"
67+
}
68+
]
69+
},
70+
{
71+
"rack_num" : 2,
72+
"new rack" : "no",
73+
"number compute" : 2,
74+
"number storage" : 3,
75+
"existing compute" : 2,
76+
"existing storage" : 3,
77+
"components" :
78+
[
79+
{
80+
"type" : "spine",
81+
"uloc" : 1,
82+
"uheight" : 1,
83+
"new component" : "no"
84+
},
85+
{
86+
"type" : "storage",
87+
"uloc" : 2,
88+
"uheight" : 2,
89+
"new component" : "no"
90+
},
91+
{
92+
"type" : "storage",
93+
"uloc" : 4,
94+
"uheight" : 2,
95+
"new component" : "no"
96+
},
97+
{
98+
"type" : "storage",
99+
"uloc" : 6,
100+
"uheight" : 2,
101+
"new component" : "yes"
102+
},
103+
{
104+
"type" : "compute",
105+
"uloc" : 16,
106+
"uheight" : 1,
107+
"new component" : "no"
108+
},
109+
{
110+
"type" : "compute",
111+
"uloc" : 17,
112+
"uheight" : 1,
113+
"new component" : "no"
114+
}
115+
]
116+
}
117+
]
118+
}

0 commit comments

Comments
 (0)