added support for flex shape (#14)

Author: hyder

compute.tf

@@ -4,7 +4,7 @@
 resource "oci_core_instance" "bastion" {
   availability_domain = element(local.ad_names, (var.availability_domain - 1))
   compartment_id      = var.compartment_id
-  freeform_tags       = var.tags   
+  freeform_tags       = var.tags
 
   create_vnic_details {
     assign_public_ip = true
@@ -15,6 +15,10 @@ resource "oci_core_instance" "bastion" {
 
   display_name = var.label_prefix == "none" ? "bastion" : "${var.label_prefix}-bastion"
 
+  launch_options {
+    network_type = "PARAVIRTUALIZED"
+  }
+
   # prevent the bastion from destroying and recreating itself if the image ocid changes 
   lifecycle {
     ignore_changes = [source_details[0].source_id]
@@ -25,11 +29,20 @@ resource "oci_core_instance" "bastion" {
     user_data           = data.template_cloudinit_config.bastion[0].rendered
   }
 
-  shape = var.bastion_shape
+  shape = lookup(var.bastion_shape, "shape", "VM.Standard.E2.2")
+
+  dynamic "shape_config" {
+    for_each = length(regexall("Flex", lookup(var.bastion_shape, "shape", "VM.Standard.E3.Flex"))) > 0 ? [1] : []
+    content {
+      ocpus         = max(1, lookup(var.bastion_shape, "ocpus", 1))
+      memory_in_gbs = (lookup(var.bastion_shape, "memory", 4) / lookup(var.bastion_shape, "ocpus", 1)) > 64 ? (lookup(var.bastion_shape, "ocpus", 1) * 4) : lookup(var.bastion_shape, "memory", 4)
+    }
+  }
 
   source_details {
-    source_type = "image"
-    source_id   = local.bastion_image_id
+    boot_volume_size_in_gbs = lookup(var.bastion_shape, "boot_volume_size", 50)
+    source_type             = "image"
+    source_id               = local.bastion_image_id
   }
 
   timeouts {

datasources.tf

@@ -51,7 +51,7 @@ data "template_file" "autonomous_cloud_init_file" {
 data "oci_core_images" "autonomous_images" {
   compartment_id           = var.compartment_id
   operating_system         = "Oracle Autonomous Linux"
-  shape                    = var.bastion_shape
+  shape                    = lookup(var.bastion_shape, "shape", "VM.Standard.E2.2")
   sort_by                  = "TIMECREATED"
 }
 

docs/terraformoptions.adoc

@@ -139,9 +139,19 @@ Ensure you review the {uri-terraform-dependencies}[dependencies].
 |Autonomous
 
 |`bastion_shape`
-|The shape of bastion instance.
-|e.g. VM.Standard.E2.2
-|VM.Standard.E2.2
+|The shape of bastion 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. `bastion_shape = {
+  shape="VM.Standard.E3.Flex",
+  ocpus=1,
+  memory=4,
+  boot_volume_size=50
+}`
+|`bastion_shape = {
+  shape="VM.Standard.E3.Flex",
+  ocpus=1,
+  memory=4,
+  boot_volume_size=50
+}`
 
 |`bastion_upgrade`
 |Whether to upgrade the bastion host packages after provisioning. It's useful to set this to false during development/testing so the bastion is provisioned faster.

terraform.tfvars.example

@@ -37,7 +37,13 @@ bastion_enabled = true
 
 bastion_image_id = "Autonomous"
 
-bastion_shape = "VM.Standard.E2.2"
+bastion_shape = {
+  # shape = "VM.Standard.E2.2"
+  shape="VM.Standard.E3.Flex",
+  ocpus=1,
+  memory=4,
+  boot_volume_size=50
+}
 
 bastion_upgrade = false
 

variables.tf

@@ -97,8 +97,10 @@ variable "bastion_image_id" {
 
 variable "bastion_shape" {
   description = "The shape of bastion instance."
-  default     = "VM.Standard.E2.2"
-  type        = string
+  default     = {
+   shape = "VM.Standard.E3.Flex", ocpus = 1, memory = 4, boot_volume_size = 50
+  }
+  type        = map(any)
 }
 
 variable "bastion_upgrade" {