Updated files for 1.2

oracle-quickstart · Jul 15, 2021 · bed1db5 · bed1db5
1 parent 64bc538
commit bed1db5
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 10 deletions.
diff --git a/provider.tf b/provider.tf
@@ -2,30 +2,30 @@
 ## All rights reserved. The Universal Permissive License (UPL), Version 1.0 as shown at http://oss.oracle.com/licenses/upl
 
 provider "oci" {
-  region               = var.region
-  tenancy_ocid         = var.tenancy_ocid
-  
+  region       = var.region
+  tenancy_ocid = var.tenancy_ocid
+
   #### BEGIN COMMENT OUT FOR USAGE ON ORM AND/OR CLOUD SHELL
   user_ocid            = var.user_ocid
   fingerprint          = var.fingerprint
   private_key          = local.private_key
   private_key_password = var.private_key_password
   #### END COMMENT OUT FOR USAGE ON ORM AND/OR CLOUD SHELL
-  
+
   disable_auto_retries = "true"
 }
 
 provider "oci" {
-  alias                = "homeregion"
-  region               = data.oci_identity_region_subscriptions.home_region_subscriptions.region_subscriptions[0].region_name
-  tenancy_ocid         = var.tenancy_ocid
-  
+  alias        = "homeregion"
+  region       = data.oci_identity_region_subscriptions.home_region_subscriptions.region_subscriptions[0].region_name
+  tenancy_ocid = var.tenancy_ocid
+
   #### BEGIN COMMENT OUT FOR USAGE ON ORM AND/OR CLOUD SHELL
   user_ocid            = var.user_ocid
   fingerprint          = var.fingerprint
   private_key          = local.private_key
   private_key_password = var.private_key_password
   #### END COMMENT OUT FOR USAGE ON ORM AND/OR CLOUD SHELL
-  
+
   disable_auto_retries = "true"
 }
diff --git a/schema.yaml b/schema.yaml
@@ -196,6 +196,12 @@
               - eq:
                 - instance_shape 
                 - "VM.Standard.E4.Flex"
+              - eq:
+                - instance_shape 
+                - "VM.Optimized3.Flex"
+              - eq:
+                - instance_shape 
+                - "VM.Standard.A1.Flex"
 
       instance_flex_shape_memory:
         type: number
@@ -215,6 +221,12 @@
               - eq:
                 - instance_shape
                 - "VM.Standard.E4.Flex"
+              - eq:
+                - instance_shape 
+                - "VM.Optimized3.Flex"
+              - eq:
+                - instance_shape 
+                - "VM.Standard.A1.Flex"
 
       instance_os:
         type: enum

diff --git a/variables.tf b/variables.tf
@@ -131,7 +131,9 @@ locals {
   # Dictionary Locals
   compute_flexible_shapes = [
     "VM.Standard.E3.Flex",
-    "VM.Standard.E4.Flex"
+    "VM.Standard.E4.Flex",
+    "VM.Optimized3.Flex",
+    "VM.Standard.A1.Flex"
   ]
   # Checks if is using Flexible Compute Shapes
   is_flexible_node_shape = contains(local.compute_flexible_shapes, var.instance_shape)