Support for flex shape and silent cloud init script (#25)

* set minimum version to Terraform 0.13

* added support for flex shape and silent mode for cloud init script

Author: hyder

compute.tf

@@ -21,6 +21,11 @@ resource "oci_core_instance" "operator" {
 
   display_name = var.label_prefix == "none" ? "operator" : "${var.label_prefix}-operator"
 
+  launch_options {
+    boot_volume_type = "PARAVIRTUALIZED"
+    network_type     = "PARAVIRTUALIZED"
+  }
+  
   # prevent the operator from destroying and recreating itself if the image ocid changes 
   lifecycle {
     ignore_changes = [source_details[0].source_id]
@@ -31,7 +36,16 @@ resource "oci_core_instance" "operator" {
     user_data           = data.template_cloudinit_config.operator[0].rendered
   }
 
-  shape = var.operator_shape
+  shape = lookup(var.operator_shape, "shape", "VM.Standard.E2.2")
+
+  dynamic "shape_config" {
+    for_each = length(regexall("Flex", lookup(var.operator_shape, "shape", "VM.Standard.E3.Flex"))) > 0 ? [1] : []
+    content {
+      ocpus         = max(1, lookup(var.operator_shape, "ocpus", 1))
+      memory_in_gbs = (lookup(var.operator_shape, "memory", 4) / lookup(var.operator_shape, "ocpus", 1)) > 64 ? (lookup(var.operator_shape, "ocpus", 1) * 4) : lookup(var.operator_shape, "memory", 4)
+    }
+  }
+
 
   source_details {
     source_type = "image"

datasources.tf

@@ -48,7 +48,7 @@ data "oci_core_images" "oracle_images" {
   compartment_id           = var.compartment_id
   operating_system         = "Oracle Linux"
   operating_system_version = "7.8"
-  shape                    = var.operator_shape
+  shape                    = lookup(var.operator_shape, "shape", "VM.Standard.E2.2")
   sort_by                  = "TIMECREATED"
 }
 

docs/terraformoptions.adoc

@@ -139,9 +139,19 @@ Ensure you review the {uri-terraform-dependencies}[dependencies].
 |Oracle
 
 |`operator_shape`
-|The shape of operator instance.
-|e.g. VM.Standard.E2.2
-|VM.Standard.E2.2
+|The shape of operator instance. This is now specified as a map and supports E3.Flex. If a non-Flex shape is specified, then the other parameters are ignored.
+|e.g. `operator_shape = {
+  shape="VM.Standard.E3.Flex",
+  ocpus=1,
+  memory=4,
+  boot_volume_size=50
+}`
+|`operator_shape = {
+  shape="VM.Standard.E3.Flex",
+  ocpus=1,
+  memory=4,
+  boot_volume_size=50
+}`
 
 |`operator_upgrade`
 |Whether to upgrade the operator host packages after provisioning. It's useful to set this to false during development/testing so the operator is provisioned faster.
@@ -214,6 +224,6 @@ Ensure you review the {uri-terraform-dependencies}[dependencies].
 tags = {
     department  = "finance"
     environment = "dev"
-    role        = "bastion"
+    role        = "operator"
 }
 ----

scripts/operator.template.sh

@@ -3,10 +3,15 @@
 # Copyright 2017, 2019, Oracle Corporation and/or affiliates.  All rights reserved.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
-yum update --security
+# yum update --security
 
-sed -i -e "s/autoinstall\s=\sno/# autoinstall = yes/g" /etc/uptrack/uptrack.conf
+# sed -i -e "s/autoinstall\s=\sno/# autoinstall = yes/g" /etc/uptrack/uptrack.conf
+
+# uptrack-upgrade
 
-uptrack-upgrade
+# pip3 install oci-cli
 
+yum -y -t update --security
+sed -i -e "s/autoinstall\s=\sno/# autoinstall = yes/g" /etc/uptrack/uptrack.conf
+uptrack-upgrade -y
 pip3 install oci-cli

terraform.tfvars.example

@@ -39,7 +39,13 @@ operator_image_id = "Oracle"
 
 operator_instance_principal = true
 
-operator_shape = "VM.Standard.E2.2"
+operator_shape = {
+  # shape = "VM.Standard.E2.2"
+  shape="VM.Standard.E3.Flex",
+  ocpus=1,
+  memory=4,
+  boot_volume_size=50
+}
 
 operator_upgrade = false
 

variables.tf

@@ -102,9 +102,11 @@ variable "operator_instance_principal" {
 }
 
 variable "operator_shape" {
-  description = "The shape of operator instance."
-  default     = "VM.Standard.E2.2"
-  type        = string
+  description = "The shape of the operator instance."
+  default     = {
+   shape = "VM.Standard.E3.Flex", ocpus = 1, memory = 4, boot_volume_size = 50
+  }
+  type        = map(any)
 }
 
 variable "operator_upgrade" {