Skip to content

Commit 24a07ad

Browse files
rashik-bhasinrashik-bhasin
authored
Merge pull request #1673 from oracle/release_gh
Releasing version 4.95.0
2 parents 6cf4fb7 + da79461 commit 24a07ad

File tree

248 files changed

+5573
-320
lines changed

Some content is hidden

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

248 files changed

+5573
-320
lines changed

‎CHANGELOG.md‎

Lines changed: 11 additions & 0 deletions

‎examples/big_data_service/main.tf‎

Lines changed: 27 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ variable "bds_instance_nodes_shape" {
7777
}
7878

7979
variable "bds_instance_worker_node_shape" {
80-
default = "VM.Standard2.1"
80+
default = "BM.Standard.E4.128"
8181
}
8282

8383
variable "bds_instance_compute_only_worker_node_shape" {
@@ -96,13 +96,15 @@ variable "bds_instance_state" {
9696
default = "ACTIVE"
9797
}
9898

99-
variable "tag_namespace_description" {
100-
default = "Just a test"
101-
}
99+
#Uncomment this when running in home region (PHX)
100+
#variable "tag_namespace_description" {
101+
# default = "Just a test"
102+
#}
102103

103-
variable "tag_namespace_name" {
104-
default = "testexamples-tag-namespace"
105-
}
104+
#Uncomment this when running in home region (PHX)
105+
#variable "tag_namespace_name" {
106+
# default = "testexamples-tag-namespace"
107+
#}
106108

107109
provider "oci" {
108110
tenancy_ocid = var.tenancy_ocid
@@ -112,19 +114,21 @@ provider "oci" {
112114
region = var.region
113115
}
114116

115-
resource "oci_identity_tag_namespace" "tag-namespace1" {
116-
#Required
117-
compartment_id = var.tenancy_ocid
118-
description = var.tag_namespace_description
119-
name = var.tag_namespace_name
120-
}
117+
#Uncomment this when running in home region (PHX)
118+
#resource "oci_identity_tag_namespace" "tag-namespace1" {
119+
# #Required
120+
# compartment_id = var.tenancy_ocid
121+
# description = var.tag_namespace_description
122+
# name = var.tag_namespace_name
123+
#}
121124

122-
resource "oci_identity_tag" "tag1" {
123-
#Required
124-
description = "tf example tag"
125-
name = "tf-example-tag"
126-
tag_namespace_id = oci_identity_tag_namespace.tag-namespace1.id
127-
}
125+
#Uncomment this when running in home region (PHX)
126+
#resource "oci_identity_tag" "tag1" {
127+
# #Required
128+
# description = "tf example tag"
129+
# name = "tf-example-tag"
130+
# tag_namespace_id = oci_identity_tag_namespace.tag-namespace1.id
131+
#}
128132

129133
resource "oci_core_vcn" "vcn_bds" {
130134
cidr_block = "111.111.0.0/16"
@@ -203,9 +207,10 @@ resource "oci_bds_bds_instance" "test_bds_instance" {
203207
is_cloud_sql_configured = false
204208

205209
#Optional
206-
defined_tags = {
207-
"${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}" = var.bds_instance_defined_tags_value
208-
}
210+
#Uncomment this when running in home region (PHX)
211+
# defined_tags = {
212+
# "${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}" = var.bds_instance_defined_tags_value
213+
# }
209214
freeform_tags = var.bds_instance_freeform_tags
210215
network_config {
211216
#Optional

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,5 +151,6 @@ resource "oci_database_data_guard_association" "test_data_guard_association" {
151151

152152
#required for ExistingDbSystem creation_type
153153
peer_db_system_id = oci_database_db_system.test_db_system2.id
154+
is_active_data_guard_enabled = "false"
154155
}
155156

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ resource "oci_database_data_guard_association" "test_data_guard_association" {
137137
node_count = "1"
138138
private_ip = "10.0.2.223"
139139
time_zone = "US/Pacific"
140+
is_active_data_guard_enabled = "false"
140141
}
141142

142143
resource "oci_core_network_security_group" "test_network_security_group" {

‎examples/nosql/child_table/main.tf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ resource "oci_nosql_table" "test_table" {
4343

4444
table_limits {
4545
#Required
46-
max_read_units = "10"
47-
max_write_units = "10"
48-
max_storage_in_gbs = "1"
46+
max_read_units = "50"
47+
max_write_units = "50"
48+
max_storage_in_gbs = "25"
4949
}
5050
}
5151

‎examples/nosql/ondemand_table/main.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ resource "oci_nosql_table" "test_ondemand" {
4141
#Required
4242
max_read_units = "0"
4343
max_write_units = "0"
44-
max_storage_in_gbs = "1"
44+
max_storage_in_gbs = "25"
4545
capacity_mode = "ON_DEMAND"
4646
}
4747
}

‎examples/nosql/table/main.tf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ resource "oci_nosql_table" "test_table" {
4343

4444
table_limits {
4545
#Required
46-
max_read_units = "10"
47-
max_storage_in_gbs = "10"
48-
max_write_units = "10"
46+
max_read_units = "50"
47+
max_write_units = "50"
48+
max_storage_in_gbs = "25"
4949
}
5050
}
5151

‎examples/stack_monitoring/monitored_resource_associate_monitored_resources/monitored_resource_associate_monitored_resource.tf‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,13 @@ resource "oci_stack_monitoring_monitored_resource" "test_monitored_resource1" {
3232
host_name = var.stack_mon_hostname_resource1
3333
management_agent_id = var.stack_mon_management_agent_id_resource1
3434
properties {
35-
name = "OS"
35+
name = "osName"
3636
value = "Linux"
3737
}
38+
properties {
39+
name = "osVersion"
40+
value = "7.0"
41+
}
3842
resource_time_zone = "en"
3943
}
4044
resource "oci_stack_monitoring_monitored_resource" "test_monitored_resource2" {
@@ -48,9 +52,13 @@ resource "oci_stack_monitoring_monitored_resource" "test_monitored_resource2" {
4852
host_name = var.stack_mon_hostname_resource2
4953
management_agent_id = var.stack_mon_management_agent_id_resource2
5054
properties {
51-
name = "OS"
55+
name = "osName"
5256
value = "Linux"
5357
}
58+
properties {
59+
name = "osVersion"
60+
value = "7.0"
61+
}
5462
resource_time_zone = "en"
5563
}
5664

‎examples/stack_monitoring/monitored_resources/monitored_resource.tf‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,18 @@ resource "oci_stack_monitoring_monitored_resource" "test_monitored_resource" {
3232
host_name = var.stack_mon_hostname_resource1
3333
management_agent_id = var.stack_mon_management_agent_id_resource1
3434
properties {
35-
name = "OS"
35+
name = "osName"
3636
value = "Linux"
3737
}
38+
properties {
39+
name = "osVersion"
40+
value = "7.0"
41+
}
3842
resource_time_zone = "en"
43+
lifecycle {
44+
ignore_changes = [
45+
properties, external_id]
46+
}
3947
}
4048

4149
data "oci_stack_monitoring_monitored_resource" "test_monitored_resource" {

‎examples/stack_monitoring/monitored_resources_list_members/monitored_resources_list_member.tf‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,13 @@ resource "oci_stack_monitoring_monitored_resource" "test_monitored_resource1" {
3232
host_name = var.stack_mon_hostname_resource1
3333
management_agent_id = var.stack_mon_management_agent_id_resource1
3434
properties {
35-
name = "OS"
35+
name = "osName"
3636
value = "Linux"
3737
}
38+
properties {
39+
name = "osVersion"
40+
value = "7.0"
41+
}
3842
resource_time_zone = "en"
3943
}
4044
resource "oci_stack_monitoring_monitored_resource" "test_monitored_resource2" {
@@ -48,9 +52,13 @@ resource "oci_stack_monitoring_monitored_resource" "test_monitored_resource2" {
4852
host_name = var.stack_mon_hostname_resource2
4953
management_agent_id = var.stack_mon_management_agent_id_resource2
5054
properties {
51-
name = "OS"
55+
name = "osName"
5256
value = "Linux"
5357
}
58+
properties {
59+
name = "osVersion"
60+
value = "7.0"
61+
}
5462
resource_time_zone = "en"
5563
}
5664

@@ -68,4 +76,4 @@ resource "oci_stack_monitoring_monitored_resources_list_member" "test_monitored_
6876

6977
#Optional
7078
destination_resource_id = oci_stack_monitoring_monitored_resource.test_monitored_resource2.id
71-
}
79+
}

0 commit comments

Comments
 (0)