Merge pull request #2059 from oracle/release_gh

Releasing version 5.32.0

Author: NagendraNigade

CHANGELOG.md

@@ -0,0 +1,92 @@
+// Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+variable "vm_multi_attach_instance_shape" {
+  default = "VM.Standard2.1"
+}
+
+resource "oci_core_volume" "test_block_volume_multi_attach" {
+  availability_domain = data.oci_identity_availability_domain.ad.name
+  compartment_id      = var.compartment_ocid
+  display_name        = "test_attach_existing_volume_on_instance_launch_1"
+  size_in_gbs         = var.db_size
+}
+
+resource "oci_core_instance" "test_vm_multi_attach_instance_launch" {
+  availability_domain = data.oci_identity_availability_domain.ad.name
+  compartment_id      = var.compartment_ocid
+  display_name        = "test_vm_multi_attach_instance"
+  shape               = var.vm_multi_attach_instance_shape
+
+  create_vnic_details {
+    subnet_id        = oci_core_subnet.test_subnet.id
+    display_name     = "primary_vnic"
+    assign_public_ip = true
+    hostname_label   = "tfexampleshinstance"
+  }
+
+  source_details {
+    source_type = "image"
+    source_id = var.instance_image_ocid[var.region]
+    # Apply this to set the size of the boot volume that is created for this instance.
+    # Otherwise, the default boot volume size of the image is used.
+    # This should only be specified when source_type is set to "image".
+    #boot_volume_size_in_gbs = "60"
+    kms_key_id = var.kms_key_ocid
+  }
+
+  // Create and attach a volume
+  launch_volume_attachments {
+    type = "iscsi"
+    display_name = "test_create_and_attach_volume_on_launch_1"
+    launch_create_volume_details {
+      volume_creation_type = "ATTRIBUTES"
+      compartment_id = var.compartment_ocid
+      display_name = "test_create_and_attach_volume_on_launch_1"
+      size_in_gbs = var.db_size
+    }
+  }
+
+  // Create and attach a volume
+  launch_volume_attachments {
+    type = "iscsi"
+    display_name = "test_create_and_attach_volume_on_launch_2"
+    launch_create_volume_details {
+      volume_creation_type = "ATTRIBUTES"
+      compartment_id = var.compartment_ocid
+      display_name = "test_create_and_attach_volume_on_launch_2"
+      size_in_gbs = var.db_size
+    }
+  }
+
+  // Attach an existing volume
+  launch_volume_attachments {
+    type = "iscsi"
+    display_name = "test_attach_existing_volume_on_launch"
+    volume_id = oci_core_volume.test_block_volume_multi_attach.id
+  }
+
+  # Apply the following flag only if you wish to preserve the attached boot volume upon destroying this instance
+  # Setting this and destroying the instance will result in a boot volume that should be managed outside of this config.
+  # When changing this value, make sure to run 'terraform apply' so that it takes effect before the resource is destroyed.
+  #preserve_boot_volume = true
+
+  // Since preserve_data_volumes_created_at_launch is a required parameter for instances launched with volumes,
+  // defaulting it to false.
+  preserve_data_volumes_created_at_launch = false
+
+  metadata = {
+    ssh_authorized_keys = var.ssh_public_key
+    user_data           = base64encode(file("./userdata/bootstrap"))
+  }
+  defined_tags = {
+    "${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag2.name}" = "awesome-app-server"
+  }
+
+  freeform_tags = {
+    "freeformkey" = "freeformvalue"
+  }
+  timeouts {
+    create = "60m"
+  }
+}

examples/compute/instance/vm_multi_attach_instance.tf

@@ -26,7 +26,7 @@ resource "oci_core_network_security_group" "test_network_security_group" {
   vcn_id         = oci_core_vcn.test_vcn.id
   lifecycle {
     ignore_changes = [
-    "defined_tags"]
+      "defined_tags"]
   }
 }
 
@@ -36,7 +36,7 @@ resource "oci_core_vcn" "test_vcn" {
   dns_label      = "testvcn"
   lifecycle {
     ignore_changes = [
-    "defined_tags"]
+      "defined_tags"]
   }
 }
 
@@ -46,11 +46,11 @@ resource "oci_core_subnet" "test_subnet" {
   dns_label      = "testsubnet"
   route_table_id = oci_core_route_table.test_route_table.id
   security_list_ids = [
-  "${oci_core_security_list.test_sec_list.id}"]
+    "${oci_core_security_list.test_sec_list.id}"]
   vcn_id = oci_core_vcn.test_vcn.id
   lifecycle {
     ignore_changes = [
-    "defined_tags"]
+      "defined_tags"]
   }
 }
 
@@ -137,9 +137,9 @@ resource "oci_container_instances_container_instance" "test_container_instance"
     #Optional
     arguments = [
       "-c",
-    "cat /mnt/my_file"]
+      "cat /mnt/my_file"]
     command = [
-    "/bin/sh"]
+      "/bin/sh"]
     display_name = "displayName"
     environment_variables = {
       "environment" = "variable"
@@ -194,6 +194,10 @@ resource "oci_container_instances_container_instance" "test_container_instance"
       is_root_file_system_readonly   = true
       run_as_group                   = 10
       run_as_user                    = 10
+      capabilities {
+        add_capabilities = ["CAP_CHOWN", "CAP_KILL"]
+        drop_capabilities = ["ALL"]
+      }
     }
   }
   shape = "CI.Standard.E4.Flex"
@@ -226,11 +230,11 @@ resource "oci_container_instances_container_instance" "test_container_instance"
 
     #Optional
     nameservers = [
-    "8.8.8.8"]
+      "8.8.8.8"]
     options = [
-    "options"]
+      "options"]
     searches = [
-    "search domain"]
+      "search domain"]
   }
   freeform_tags = {
     "bar-key" = "foo-value"