Merge pull request #690 from terraform-providers/release

Release 3.12.0

Author: dshelbyo

CHANGELOG.md

@@ -1,4 +1,18 @@
-## 3.11.3 (Unreleased)
+## 3.12.0 (Unreleased)
+
+### Added
+- Support for `retry_duration_seconds` option to configure length of retry in the face of HTTP 429 and 500 errors
+- Support for custom header insertion, extension, and removal for Load Balancer listener resource
+- Support for consistent volume names in the Block Volume attachments
+
+### Fixed
+- Retried SDK calls are now jittered to avoid herding of retry requests in high parallelism scenarios
+- Fail the initialization of the provider if either of `user_ocid`, `fingerprint`, `private_key`, `private_key_path` or `private_key_password` are specified for `InstancePrincipal` or `InstancePrincipalWithCerts` auth mode.
+
+### Note
+- Examples and test updated to use VM.Standard2.1
+- Windows example image updated to Windows-Server-2012-R2-Standard-Edition-VM-Gen2-2018.12.12-0 
+
 ## 3.11.2 (January 10, 2019)
 
 ### Fixed

docs/examples/compute/image/compute.tf

@@ -13,7 +13,7 @@ resource "oci_core_instance" "TFInstance" {
 
   source_details {
     source_type = "image"
-    source_id   = "${lookup(data.oci_core_images.TFSupportedShapeImages.images[0], "id")}"
+    source_id   = "${var.instance_image_ocid[var.region]}"
   }
 
   metadata {

docs/examples/compute/image/datasources.tf

@@ -5,18 +5,24 @@ data "oci_identity_availability_domains" "ADs" {
 
 # Gets the custom image that will be created by this Terraform config
 data "oci_core_images" "TFCustomImage" {
-  compartment_id = "${var.tenancy_ocid}"
+  compartment_id = "${var.compartment_ocid}"
 
   filter {
     name   = "id"
     values = ["${oci_core_image.TFCustomImage.id}"]
   }
 }
 
-# Gets a list of all Oracle Linux 7.4 images that support a given Instance shape
+# Gets a list of images within a tenancy
 data "oci_core_images" "TFSupportedShapeImages" {
-  compartment_id           = "${var.tenancy_ocid}"
-  shape                    = "${var.instance_shape}"
-  operating_system         = "${var.ImageOS}"
-  operating_system_version = "${var.ImageOSVersion}"
+  compartment_id = "${var.tenancy_ocid}"
+
+  # Uncomment below to filter images that support a specific instance shape 
+  #shape                    = "VM.Standard2.1"
+
+  # Uncomment below to filter images that are a specific OS
+  #operating_system         = "Oracle Linux"
+
+  # Uncomment below to filter images that are a specific OS version 
+  #operating_system_version = "7.5"
 }

docs/examples/compute/image/variables.tf

@@ -16,10 +16,16 @@ variable "instance_shape" {
   default = "VM.Standard2.1"
 }
 
-variable "ImageOS" {
-  default = "Oracle Linux"
-}
+variable "instance_image_ocid" {
+  type = "map"
+
+  default = {
+    // See https://docs.us-phoenix-1.oraclecloud.com/images/
+    // Oracle-provided image "Oracle-Linux-7.5-2018.10.16-0"
+    us-phoenix-1 = "ocid1.image.oc1.phx.aaaaaaaaoqj42sokaoh42l76wsyhn3k2beuntrh5maj3gmgmzeyr55zzrwwa"
 
-variable "ImageOSVersion" {
-  default = "7.4"
+    us-ashburn-1   = "ocid1.image.oc1.iad.aaaaaaaageeenzyuxgia726xur4ztaoxbxyjlxogdhreu3ngfj2gji3bayda"
+    eu-frankfurt-1 = "ocid1.image.oc1.eu-frankfurt-1.aaaaaaaaitzn6tdyjer7jl34h2ujz74jwy5nkbukbh55ekp6oyzwrtfa4zma"
+    uk-london-1    = "ocid1.image.oc1.uk-london-1.aaaaaaaa32voyikkkzfxyo4xbdmadc2dmvorfxxgdhpnk6dw64fa3l4jh7wa"
+  }
 }

docs/examples/compute/instance/block.tf

@@ -12,6 +12,7 @@ resource "oci_core_volume_attachment" "TFBlockAttach" {
   compartment_id  = "${var.compartment_ocid}"
   instance_id     = "${oci_core_instance.TFInstance.*.id[count.index / var.NumIscsiVolumesPerInstance]}"
   volume_id       = "${oci_core_volume.TFBlock.*.id[count.index]}"
+  device          = "${count.index == 0 ? var.volume_attachment_device : ""}"
 
   # Set this to enable CHAP authentication for an ISCSI volume attachment. The oci_core_volume_attachment resource will
   # contain the CHAP authentication details via the "chap_secret" and "chap_username" attributes.

docs/examples/compute/instance/datasources.tf

@@ -12,3 +12,7 @@ data "oci_core_boot_volume_attachments" "TFBootVolumeAttachments" {
 
   instance_id = "${oci_core_instance.TFInstance.*.id[count.index]}"
 }
+
+data "oci_core_instance_devices" "TFInstanceDevices" {
+  instance_id = "${oci_core_instance.TFInstance.*.id[count.index]}"
+}

docs/examples/compute/instance/outputs.tf

@@ -12,6 +12,10 @@ output "BootVolumeIDs" {
   value = ["${oci_core_instance.TFInstance.*.boot_volume_id}"]
 }
 
+output "InstanceDevices" {
+  value = ["${data.oci_core_instance_devices.TFInstanceDevices.devices}"]
+}
+
 # Output the chap secret information for ISCSI volume attachments. This can be used to output
 # CHAP information for ISCSI volume attachments that have "use_chap" set to true.
 #output "IscsiVolumeAttachmentChapUsernames" {

docs/examples/compute/instance/variables.tf

@@ -62,3 +62,7 @@ variable "tag_namespace_description" {
 variable "tag_namespace_name" {
   default = "exampletagns"
 }
+
+variable "volume_attachment_device" {
+  default = "/dev/oracleoci/oraclevdb"
+}

docs/examples/compute/windows/variables.tf

@@ -50,13 +50,14 @@ variable instance_image_ocid {
   type = "map"
 
   default = {
-    # Images released in and after July 2018 have cloudbase-init and winrm enabled by default, refer to the release notes - https://docs.cloud.oracle.com/iaas/images/
-    # Image OCIDs for Windows-Server-2012-R2-Standard-Edition-VM-2018.07.19-0 - https://docs.cloud.oracle.com/iaas/images/image/256a6d7c-4fc0-47c7-a61c-b6bbf25c8aba/
-    eu-frankfurt-1 = "ocid1.image.oc1.eu-frankfurt-1.aaaaaaaa3nh5j3l3ip62tb2z4gkcrfn23yhwucui5do5abrk4ttvwclxu7ja"
+    # Images released after June 2018 have cloudbase-init and winrm enabled by default, refer to the release notes - https://docs.cloud.oracle.com/iaas/images/
+    # The below Image OCIDs are for Windows-Server-2012-R2-Standard-Edition-VM-Gen2-2018.12.12-0
+    # See https://docs.cloud.oracle.com/iaas/images/image/5e34cde5-6cef-4cc3-b8f1-c8fc3a088302/
+    us-phoenix-1 = "ocid1.image.oc1.phx.aaaaaaaarlo3ace3wq34aompwj3u2z2xteonboapg663woz6d2iovarowhja"
 
-    us-ashburn-1 = "ocid1.image.oc1.iad.aaaaaaaauybkm3gymmgenl3e7eqjcjuh324hbocftnxhyn5o2ghpy4st6xza"
-    uk-london-1  = "ocid1.image.oc1.uk-london-1.aaaaaaaad3q2sx2ngclnggc4nvpop6szposwxnljvuswhimiszwcsltsvi2q"
-    us-phoenix-1 = "ocid1.image.oc1.phx.aaaaaaaaqcty27fjcgov3a2hl6bimama5l3isv2ejs7utulnpfw5btyyb7gq"
+    us-ashburn-1   = "ocid1.image.oc1.iad.aaaaaaaabzwak2haqxh3r7h6dajgu4enp7q7hcrreql45awryd5frjsd5l6a"
+    eu-frankfurt-1 = "ocid1.image.oc1.eu-frankfurt-1.aaaaaaaaourcjktoe3gprvwfksxc36r4rxgbcjs5qvtrja6w6euivci635vq"
+    uk-london-1    = "ocid1.image.oc1.uk-london-1.aaaaaaaadb4mg7ii73wkrntmiunr7x7qrh7ompczvy3xbggm27pkhotpgj2q"
   }
 }
 

docs/examples/load_balancer/lb_full/lb_full.tf

@@ -281,6 +281,7 @@ resource "oci_load_balancer_listener" "lb-listener1" {
   hostname_names           = ["${oci_load_balancer_hostname.test_hostname1.name}", "${oci_load_balancer_hostname.test_hostname2.name}"]
   port                     = 80
   protocol                 = "HTTP"
+  rule_set_names           = ["${oci_load_balancer_rule_set.test_rule_set.name}"]
 
   connection_configuration {
     idle_timeout_in_seconds = "2"
@@ -322,6 +323,17 @@ resource "oci_load_balancer_backend" "lb-be2" {
   weight           = 1
 }
 
+resource "oci_load_balancer_rule_set" "test_rule_set" {
+  items {
+    action = "ADD_HTTP_REQUEST_HEADER"
+    header = "example_header_name"
+    value  = "example_header_value"
+  }
+
+  load_balancer_id = "${oci_load_balancer.lb1.id}"
+  name             = "example-rule-set-name"
+}
+
 output "lb_public_ip" {
   value = ["${oci_load_balancer.lb1.ip_addresses}"]
 }