Skip to content

Commit 3a65025

Browse files
dshelbyodshelbyo
authored
Release 3.17.0
Release 3.17.0
2 parents 7832f7d + 8c684ff commit 3a65025

File tree

467 files changed

+22431
-942
lines changed

Some content is hidden

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

467 files changed

+22431
-942
lines changed

‎CHANGELOG.md‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
1-
## 3.16.1 (Unreleased)
1+
## 3.17.0 (Unreleased)
2+
3+
### Added
4+
- Add singular Availability Domain data source with related example updates
5+
- Support for Monitoring service
6+
- Adding ability to disable monitoring in instances
7+
- Adding support for Metrics-based Dynamic Auto-scaling
8+
- Support for listing and specifying Fault Domains in Database resources
9+
- Support for Notification service
10+
211
## 3.16.0 (February 26, 2019)
312

413
### Added

‎docs/examples/autoscaling/compute.tf‎

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
// Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
2+
3+
resource "oci_core_instance" "TFInstance" {
4+
availability_domain = "${data.oci_identity_availability_domain.AD.name}"
5+
compartment_id = "${var.compartment_ocid}"
6+
display_name = "TFInstanceForInstancePool"
7+
shape = "${var.instance_shape}"
8+
9+
create_vnic_details {
10+
subnet_id = "${oci_core_subnet.ExampleSubnet.id}"
11+
display_name = "primaryvnic"
12+
assign_public_ip = true
13+
hostname_label = "tfexampleinstance${count.index}"
14+
}
15+
16+
source_details {
17+
source_type = "image"
18+
source_id = "${var.instance_image_ocid[var.region]}"
19+
}
20+
21+
timeouts {
22+
create = "60m"
23+
}
24+
}
25+
26+
resource "oci_core_instance_configuration" "TFInstanceConfiguration" {
27+
compartment_id = "${var.compartment_ocid}"
28+
display_name = "TFExampleInstanceConfiguration"
29+
30+
instance_details {
31+
instance_type = "compute"
32+
33+
launch_details {
34+
compartment_id = "${var.compartment_ocid}"
35+
ipxe_script = "ipxeScript"
36+
shape = "${var.instance_shape}"
37+
display_name = "TFExampleInstanceConfigurationLaunchDetails"
38+
39+
create_vnic_details {
40+
assign_public_ip = true
41+
display_name = "TFExampleInstanceConfigurationVNIC"
42+
skip_source_dest_check = false
43+
}
44+
45+
extended_metadata = {
46+
some_string = "stringA"
47+
nested_object = "{\"some_string\": \"stringB\", \"object\": {\"some_string\": \"stringC\"}}"
48+
}
49+
50+
source_details = {
51+
source_type = "image"
52+
image_id = "${var.instance_image_ocid[var.region]}"
53+
}
54+
}
55+
}
56+
}
57+
58+
resource "oci_core_instance_pool" "TFInstancePool" {
59+
compartment_id = "${var.compartment_ocid}"
60+
instance_configuration_id = "${oci_core_instance_configuration.TFInstanceConfiguration.id}"
61+
size = 2
62+
state = "RUNNING"
63+
display_name = "TFInstancePool"
64+
65+
placement_configurations {
66+
availability_domain = "${data.oci_identity_availability_domain.AD.name}"
67+
primary_subnet_id = "${oci_core_subnet.ExampleSubnet.id}"
68+
}
69+
}
70+
71+
resource "oci_autoscaling_auto_scaling_configuration" "TFAutoScalingConfiguration" {
72+
compartment_id = "${var.compartment_ocid}"
73+
cool_down_in_seconds = "300"
74+
display_name = "TFAutoScalingConfiguration"
75+
is_enabled = "true"
76+
77+
policies {
78+
capacity {
79+
initial = "4"
80+
max = "4"
81+
min = "2"
82+
}
83+
84+
display_name = "TFPolicy"
85+
policy_type = "threshold"
86+
87+
rules {
88+
action {
89+
type = "CHANGE_COUNT_BY"
90+
value = "1"
91+
}
92+
93+
display_name = "TFScaleOutRule"
94+
95+
metric {
96+
metric_type = "CPU_UTILIZATION"
97+
98+
threshold {
99+
operator = "GT"
100+
value = "1"
101+
}
102+
}
103+
}
104+
105+
rules {
106+
action {
107+
type = "CHANGE_COUNT_BY"
108+
value = "-1"
109+
}
110+
111+
display_name = "TFScaleInRule"
112+
113+
metric {
114+
metric_type = "CPU_UTILIZATION"
115+
116+
threshold {
117+
operator = "LT"
118+
value = "1"
119+
}
120+
}
121+
}
122+
}
123+
124+
auto_scaling_resources {
125+
id = "${oci_core_instance_pool.TFInstancePool.id}"
126+
type = "instancePool"
127+
}
128+
}

‎docs/examples/autoscaling/datasources.tf‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
// Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
2+
3+
# Gets a list of Availability Domains
4+
data "oci_identity_availability_domain" "AD" {
5+
compartment_id = "${var.tenancy_ocid}"
6+
ad_number = "1"
7+
}
8+
9+
data "oci_core_instance_configuration" TFInstanceConfigurationDatasource {
10+
instance_configuration_id = "${oci_core_instance_configuration.TFInstanceConfiguration.id}"
11+
}
12+
13+
data "oci_core_instance_configurations" TFInstanceConfigurationDatasources {
14+
compartment_id = "${var.compartment_ocid}"
15+
16+
filter {
17+
name = "id"
18+
values = ["${oci_core_instance_configuration.TFInstanceConfiguration.id}"]
19+
}
20+
}
21+
22+
data "oci_core_instance_pool" "TFInstancePoolDatasource" {
23+
instance_pool_id = "${oci_core_instance_pool.TFInstancePool.id}"
24+
}
25+
26+
data "oci_core_instance_pools" "TFInstancePoolDatasources" {
27+
compartment_id = "${var.compartment_ocid}"
28+
display_name = "TFInstancePool"
29+
state = "RUNNING"
30+
31+
filter {
32+
name = "id"
33+
values = ["${oci_core_instance_pool.TFInstancePool.id}"]
34+
}
35+
}
36+
37+
data "oci_core_instance_pool_instances" "TFInstancePoolInstanceDatasources" {
38+
compartment_id = "${var.compartment_ocid}"
39+
instance_pool_id = "${oci_core_instance_pool.TFInstancePool.id}"
40+
display_name = "TFInstancePool"
41+
}
42+
43+
data "oci_autoscaling_auto_scaling_configuration" "TFAutoScalingConfigurationDatasource" {
44+
auto_scaling_configuration_id = "${oci_autoscaling_auto_scaling_configuration.TFAutoScalingConfiguration.id}"
45+
}
46+
47+
data "oci_autoscaling_auto_scaling_configurations" "TFAutoScalingConfigurationDatasources" {
48+
compartment_id = "${var.compartment_ocid}"
49+
display_name = "TFAutoScalingConfiguration"
50+
51+
filter {
52+
name = "id"
53+
values = ["${oci_autoscaling_auto_scaling_configuration.TFAutoScalingConfiguration.id}"]
54+
}
55+
}

‎docs/examples/compute/pv_encription_enabled_volume_attachment/env-vars‎ renamed to ‎docs/examples/autoscaling/env-vars‎

File renamed without changes.

‎docs/examples/compute/pv_encription_enabled_volume_attachment/network.tf‎ renamed to ‎docs/examples/autoscaling/network.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ resource "oci_core_virtual_network" "ExampleVCN" {
88
}
99

1010
resource "oci_core_subnet" "ExampleSubnet" {
11-
availability_domain = "${lookup(data.oci_identity_availability_domains.ADs.availability_domains[var.availability_domain - 1],"name")}"
11+
availability_domain = "${data.oci_identity_availability_domain.AD.name}"
1212
cidr_block = "10.1.20.0/24"
1313
display_name = "TFExampleSubnet"
1414
dns_label = "tfexamplesubnet"

‎docs/examples/compute/pv_encription_enabled_volume_attachment/provider.tf‎ renamed to ‎docs/examples/autoscaling/provider.tf‎

File renamed without changes.

‎docs/examples/autoscaling/variables.tf‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
// Copyright (c) 2017, 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 "region" {}
8+
9+
variable "compartment_ocid" {}
10+
variable "ssh_public_key" {}
11+
variable "ssh_private_key" {}
12+
13+
variable "instance_shape" {
14+
default = "VM.Standard2.1"
15+
}
16+
17+
variable "instance_image_ocid" {
18+
type = "map"
19+
20+
default = {
21+
// See https://docs.us-phoenix-1.oraclecloud.com/images/
22+
// Oracle-provided image "Oracle-Linux-7.5-2018.10.16-0"
23+
us-phoenix-1 = "ocid1.image.oc1.phx.aaaaaaaaoqj42sokaoh42l76wsyhn3k2beuntrh5maj3gmgmzeyr55zzrwwa"
24+
25+
us-ashburn-1 = "ocid1.image.oc1.iad.aaaaaaaageeenzyuxgia726xur4ztaoxbxyjlxogdhreu3ngfj2gji3bayda"
26+
eu-frankfurt-1 = "ocid1.image.oc1.eu-frankfurt-1.aaaaaaaaitzn6tdyjer7jl34h2ujz74jwy5nkbukbh55ekp6oyzwrtfa4zma"
27+
uk-london-1 = "ocid1.image.oc1.uk-london-1.aaaaaaaa32voyikkkzfxyo4xbdmadc2dmvorfxxgdhpnk6dw64fa3l4jh7wa"
28+
}
29+
}
30+
31+
# Choose an Availability Domain
32+
variable "availability_domain" {
33+
default = "3"
34+
}

‎docs/examples/compute/boot_volume/compute.tf‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
22

33
resource "oci_core_instance" "TFInstance" {
4-
availability_domain = "${lookup(data.oci_identity_availability_domains.ADs.availability_domains[var.availability_domain - 1],"name")}"
4+
availability_domain = "${data.oci_identity_availability_domain.ad.name}"
55
compartment_id = "${var.compartment_ocid}"
66
display_name = "TFInstance"
77
shape = "${var.instance_shape}"
@@ -27,6 +27,7 @@ resource "oci_core_instance" "TFInstance" {
2727
}
2828
}
2929

30-
data "oci_identity_availability_domains" "ADs" {
30+
data "oci_identity_availability_domain" "ad" {
3131
compartment_id = "${var.tenancy_ocid}"
32+
ad_number = 1
3233
}

‎docs/examples/compute/boot_volume/network.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ resource "oci_core_virtual_network" "ExampleVCN" {
88
}
99

1010
resource "oci_core_subnet" "ExampleSubnet" {
11-
availability_domain = "${lookup(data.oci_identity_availability_domains.ADs.availability_domains[var.availability_domain - 1],"name")}"
11+
availability_domain = "${data.oci_identity_availability_domain.ad.name}"
1212
cidr_block = "10.1.20.0/24"
1313
display_name = "TFExampleSubnet"
1414
dns_label = "tfexamplesubnet"

‎docs/examples/compute/boot_volume/variables.tf‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,6 @@ variable "compartment_ocid" {}
1010
variable "ssh_public_key" {}
1111
variable "ssh_private_key" {}
1212

13-
# Choose an Availability Domain
14-
variable "availability_domain" {
15-
default = "3"
16-
}
17-
1813
variable "instance_shape" {
1914
default = "VM.Standard2.1"
2015
}

0 commit comments

Comments
 (0)