Skip to content

Commit 70cfbcc

Browse files
Merge pull request #2194 from oracle/release_gh
Releasing version 6.10.0
2 parents cbb2d86 + f615216 commit 70cfbcc

File tree

316 files changed

+10090
-829
lines changed

Some content is hidden

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

316 files changed

+10090
-829
lines changed

CHANGELOG.md

Lines changed: 138 additions & 177 deletions
Large diffs are not rendered by default.
Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
variable "tenancy_ocid" {}
2+
variable "region" {}
3+
variable "compartment_id" {}
4+
variable "bds_instance_id" {}
5+
6+
7+
variable "bds_instance_os_patch_action_cluster_admin_password" {
8+
default = "T3JhY2xlVGVhbVVTQSExMjM="
9+
}
10+
11+
variable "bds_instance_os_patch_action_os_patch_version" {
12+
default = "ol7.9-x86_64-1.27.0.696-0.0"
13+
}
14+
15+
variable "bds_instance_os_patch_action_patching_config_strategy" {
16+
default = "BATCHING_BASED"
17+
}
18+
19+
variable "bds_instance_os_patch_action_batch_size" {
20+
default = "1"
21+
}
22+
23+
variable "bds_instance_os_patch_action_wait_time_between_batch_in_seconds" {
24+
default = "120"
25+
}
26+
27+
variable "bds_instance_os_patch_action_tolerance_threshold_per_batch" {
28+
default = "0"
29+
}
30+
31+
variable "bds_instance_os_patch_action_wait_time_between_domain_in_seconds" {
32+
default = "120"
33+
}
34+
35+
variable "bds_instance_os_patch_action_tolerance_threshold_per_domain" {
36+
default = "1"
37+
}
38+
39+
variable "bds_instance_get_os_patch_os_patch_version" {
40+
default = "ol7.9-x86_64-1.27.0.696-0.0"
41+
}
42+
43+
resource "oci_bds_bds_instance_os_patch_action" "test_bds_instance_os_patch_action" {
44+
#Required
45+
bds_instance_id = var.bds_instance_id
46+
cluster_admin_password = var.bds_instance_os_patch_action_cluster_admin_password
47+
os_patch_version = var.bds_instance_os_patch_action_os_patch_version
48+
patching_configs {
49+
patching_config_strategy = var.bds_instance_os_patch_action_patching_config_strategy
50+
batch_size = var.bds_instance_os_patch_action_batch_size
51+
wait_time_between_batch_in_seconds = var.bds_instance_os_patch_action_wait_time_between_batch_in_seconds
52+
tolerance_threshold_per_batch = var.bds_instance_os_patch_action_tolerance_threshold_per_batch
53+
54+
wait_time_between_domain_in_seconds = var.bds_instance_os_patch_action_wait_time_between_domain_in_seconds
55+
tolerance_threshold_per_domain = var.bds_instance_os_patch_action_tolerance_threshold_per_domain
56+
}
57+
58+
timeouts {
59+
create = "24h"
60+
update = "24h"
61+
delete = "24h"
62+
}
63+
64+
}
65+
66+
data "oci_bds_bds_instance_get_os_patch" "test_bds_instance_get_os_patch" {
67+
bds_instance_id = var.bds_instance_id
68+
os_patch_version = var.bds_instance_get_os_patch_os_patch_version
69+
}
70+
71+
data "oci_bds_bds_instance_list_os_patches" "test_bds_instance_list_os_patches" {
72+
bds_instance_id = var.bds_instance_id
73+
}
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
// Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
2+
// Licensed under the Mozilla Public License v2.0
3+
4+
variable "tenancy_ocid" {}
5+
variable "user_ocid" {}
6+
variable "fingerprint" {}
7+
variable "private_key_path" {}
8+
variable "region" {}
9+
variable "compartment_id" {}
10+
11+
variable "internal_namespace_occ_overview_from" {
12+
default = "2023-08-05T17:17:14.816Z"
13+
}
14+
15+
variable "internal_namespace_occ_overview_namespace" {
16+
default = "COMPUTE"
17+
}
18+
19+
variable "internal_namespace_occ_overview_to" {
20+
default = "2023-10-05T17:17:14.816Z"
21+
}
22+
23+
variable "internal_namespace_occ_overview_workload_type" {
24+
default = "workloadType"
25+
}
26+
27+
variable "occ_customer_group_id" {
28+
default = "customerGroupId"
29+
}
30+
31+
32+
provider "oci" {
33+
tenancy_ocid = var.tenancy_ocid
34+
user_ocid = var.user_ocid
35+
fingerprint = var.fingerprint
36+
private_key_path = var.private_key_path
37+
region = var.region
38+
}
39+
40+
data "oci_capacity_management_internal_namespace_occ_overviews" "test_internal_namespace_occ_overviews" {
41+
#Required
42+
compartment_id = var.compartment_id
43+
namespace = var.internal_namespace_occ_overview_namespace
44+
occ_customer_group_id = var.occ_customer_group_id
45+
46+
#Optional
47+
from = var.internal_namespace_occ_overview_from
48+
to = var.internal_namespace_occ_overview_to
49+
workload_type = var.internal_namespace_occ_overview_workload_type
50+
}

examples/capacity_management/InternalOccAvailabilityCatalogs/internal_occ_availability_catalog.tf

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
1+
// Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
22
// Licensed under the Mozilla Public License v2.0
33

44
variable "tenancy_ocid" {}
@@ -9,7 +9,7 @@ variable "region" {}
99
variable "compartment_id" {}
1010

1111
variable "internal_occ_availability_catalog_catalog_state" {
12-
default = "NOT_UPLOADED"
12+
default = "STAGED"
1313
}
1414

1515
variable "internal_occ_availability_catalog_display_name" {
@@ -24,7 +24,9 @@ variable "internal_occ_availability_catalog_namespace" {
2424
default = "COMPUTE"
2525
}
2626

27-
27+
variable "occ_customer_group_id" {
28+
default = "customerGroupId"
29+
}
2830

2931
provider "oci" {
3032
tenancy_ocid = var.tenancy_ocid
@@ -36,12 +38,12 @@ provider "oci" {
3638

3739
data "oci_capacity_management_internal_occ_availability_catalogs" "test_internal_occ_availability_catalogs" {
3840
#Required
39-
compartment_id = var.compartment_id
41+
compartment_id = var.compartment_id
42+
occ_customer_group_id = var.occ_customer_group_id
4043

4144
#Optional
42-
catalog_state = var.internal_occ_availability_catalog_catalog_state
43-
display_name = var.internal_occ_availability_catalog_display_name
44-
id = var.internal_occ_availability_catalog_id
45-
namespace = var.internal_occ_availability_catalog_namespace
46-
occ_customer_group_id = oci_capacity_management_occ_customer_group.test_occ_customer_group.id
45+
catalog_state = var.internal_occ_availability_catalog_catalog_state
46+
display_name = var.internal_occ_availability_catalog_display_name
47+
id = var.internal_occ_availability_catalog_id
48+
namespace = var.internal_occ_availability_catalog_namespace
4749
}
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
// Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
2+
// Licensed under the Mozilla Public License v2.0
3+
4+
variable "tenancy_ocid" {}
5+
variable "user_ocid" {}
6+
variable "fingerprint" {}
7+
variable "private_key_path" {}
8+
variable "region" {}
9+
10+
variable "occ_handover_resource_block_id" {
11+
default = "handoverResourceBlockId"
12+
}
13+
14+
variable "occ_handover_resource_host_id" {
15+
default = "hostId"
16+
}
17+
18+
19+
provider "oci" {
20+
tenancy_ocid = var.tenancy_ocid
21+
user_ocid = var.user_ocid
22+
fingerprint = var.fingerprint
23+
private_key_path = var.private_key_path
24+
region = var.region
25+
}
26+
27+
data "oci_capacity_management_internal_occ_handover_resource_block_details" "test_internal_occ_handover_resource_block_details" {
28+
#Required
29+
occ_handover_resource_block_id = var.occ_handover_resource_block_id
30+
31+
#Optional
32+
host_id = var.occ_handover_resource_host_id
33+
}
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
// Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
2+
// Licensed under the Mozilla Public License v2.0
3+
4+
variable "tenancy_ocid" {}
5+
variable "user_ocid" {}
6+
variable "fingerprint" {}
7+
variable "private_key_path" {}
8+
variable "region" {}
9+
variable "compartment_id" {}
10+
11+
variable "internal_occ_handover_resource_block_handover_date_greater_than_or_equal_to" {
12+
default = "2023-08-05T17:17:14.816Z"
13+
}
14+
15+
variable "internal_occ_handover_resource_block_handover_date_less_than_or_equal_to" {
16+
default = "2024-08-05T17:17:14.816Z"
17+
}
18+
19+
variable "internal_occ_handover_resource_block_namespace" {
20+
default = "COMPUTE"
21+
}
22+
23+
variable "occ_customer_group_id" {
24+
default = "customerGroupId"
25+
}
26+
27+
variable "occ_handover_resource_block_id" {
28+
default = "handoverResourceBlockId"
29+
}
30+
31+
variable "occ_handover_resource_resource_name" {
32+
default = "handoverResource"
33+
}
34+
35+
36+
37+
provider "oci" {
38+
tenancy_ocid = var.tenancy_ocid
39+
user_ocid = var.user_ocid
40+
fingerprint = var.fingerprint
41+
private_key_path = var.private_key_path
42+
region = var.region
43+
}
44+
45+
data "oci_capacity_management_internal_occ_handover_resource_blocks" "test_internal_occ_handover_resource_blocks" {
46+
#Required
47+
compartment_id = var.compartment_id
48+
namespace = var.internal_occ_handover_resource_block_namespace
49+
occ_customer_group_id = var.occ_customer_group_id
50+
51+
#Optional
52+
handover_date_greater_than_or_equal_to = var.internal_occ_handover_resource_block_handover_date_greater_than_or_equal_to
53+
handover_date_less_than_or_equal_to = var.internal_occ_handover_resource_block_handover_date_less_than_or_equal_to
54+
handover_resource_name = var.occ_handover_resource_resource_name
55+
occ_handover_resource_block_id = var.occ_handover_resource_block_id
56+
}
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
// Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
2+
// Licensed under the Mozilla Public License v2.0
3+
4+
variable "tenancy_ocid" {}
5+
variable "user_ocid" {}
6+
variable "fingerprint" {}
7+
variable "private_key_path" {}
8+
variable "region" {}
9+
variable "compartment_id" {}
10+
11+
variable "namespace_occ_overview_from" {
12+
default = "2023-08-05T17:17:14.816Z"
13+
}
14+
15+
variable "namespace_occ_overview_namespace" {
16+
default = "COMPUTE"
17+
}
18+
19+
variable "namespace_occ_overview_to" {
20+
default = "2024-08-05T17:17:14.816Z"
21+
}
22+
23+
variable "namespace_occ_overview_workload_type" {
24+
default = "workloadType"
25+
}
26+
27+
28+
29+
provider "oci" {
30+
tenancy_ocid = var.tenancy_ocid
31+
user_ocid = var.user_ocid
32+
fingerprint = var.fingerprint
33+
private_key_path = var.private_key_path
34+
region = var.region
35+
}
36+
37+
data "oci_capacity_management_namespace_occ_overviews" "test_namespace_occ_overviews" {
38+
#Required
39+
compartment_id = var.compartment_id
40+
namespace = var.namespace_occ_overview_namespace
41+
42+
#Optional
43+
from = var.namespace_occ_overview_from
44+
to = var.namespace_occ_overview_to
45+
workload_type = var.namespace_occ_overview_workload_type
46+
}

0 commit comments

Comments
 (0)