switch back to string value for region, added a home_region variable (#382)

Signed-off-by: Ali Mukadam <[email protected]>

Author: hyder

docs/configuration.adoc

@@ -106,24 +106,22 @@ The 3 OCI parameters here mainly concern:
 
 * `compartment_id`: is the compartment where all the resources will be created in
 * `label_prefix`: this will prepend a string to the name of every resource created
-* `regions`: this allows you to select the region where you want the OKE cluster deployed
+* `region`: this allows you to select the region where you want the OKE cluster deployed
 
 
 e.g.
 
 ----
 compartment_id = "compartment_id = "ocid1.compartment...."
 label_prefix   = "dev"
-regions = {
-  home    = "us-phoenix-1"
-  oke     = "ap-sydney-1"
-}
+home_region = "us-phoenix-1"
+region = "ap-sydney-1"
 ----
 
 Regions must have exactly 2 entries as above:
 
-* home: is the tenancy's home region
-* oke: is the region where the oke cluster will be created
+* home_region: is the tenancy's home region. This may be different from the region where you want to create OKE.
+* region: is the actual region where you want to create the OKE cluster.
 
 The list of regions can be found {uri-oci-region}[here].
 

docs/quickstart.adoc

@@ -58,15 +58,15 @@ You need to create 2 providers:
 provider "oci" {
   fingerprint      = var.api_fingerprint
   private_key_path = var.api_private_key_path
-  region           = var.regions["oke"]
+  region           = var.region
   tenancy_ocid     = var.tenancy_id
   user_ocid        = var.user_id
 }
 
 provider "oci" {
   fingerprint      = var.api_fingerprint
   private_key_path = var.api_private_key_path
-  region           = var.regions["home"]
+  region           = var.home_region
   tenancy_ocid     = var.tenancy_id
   user_ocid        = var.user_id
   alias            = "home"

docs/terraformoptions.adoc

@@ -61,13 +61,16 @@ EOT
 |
 |none
 
-|regions
-|A map of OCI regions where resources will be created. The map must have 2 keys: 1) oke is where OKE will be created 2) home is the tenancy's home region.. {uri-oci-region}[List of regions]. *Required*
+|home_region
+|The tenancy's home region. Required to perform identity operations. *Required*
 |
-regions = {
-  home    = "us-phoenix-1"
-  oke     = "ap-sydney-1"
-}
+region = "us-ashburn-1"
+|
+
+|region
+|The OCI region where OKE resources will be created. Please select from {uri-oci-region}[list of regions]. *Required*
+|
+region = "ap-sydney-1"
 |
 
 |tenancy_id

main.tf

@@ -251,7 +251,7 @@ module "extensions" {
   label_prefix   = var.label_prefix
 
   # region parameters
-  region = var.regions["oke"]
+  region = var.region
 
   # ssh keys
   ssh_private_key      = var.ssh_private_key

terraform.tfvars.example

@@ -8,10 +8,8 @@ api_fingerprint      = ""
 
 api_private_key_path = ""
 
-regions = {
-  home    = "us-phoenix-1"
-  oke     = "ap-sydney-1"
-}
+home_region = "us-ashburn-1"
+region = "us-phoenix-1"
 
 tenancy_id           = ""
 user_id              = ""

variables.tf

@@ -28,10 +28,16 @@ variable "api_private_key_path" {
   type        = string
 }
 
-variable "regions" {
+variable "home_region" {
   # List of regions: https://docs.cloud.oracle.com/iaas/Content/General/Concepts/regions.htm#ServiceAvailabilityAcrossRegions
-  description = "A map of OCI regions where resources will be created. The map must have 2 keys: 1) oke is where OKE will be created 2) home is the tenancy's home region."
-  type        = map(string)
+  description = "The tenancy's home region. Required to perform identity operations."
+  type        = string  
+}
+
+variable "region" {
+  # List of regions: https://docs.cloud.oracle.com/iaas/Content/General/Concepts/regions.htm#ServiceAvailabilityAcrossRegions
+  description = "The OCI region where OKE resources will be created."
+  type        = string
 }
 
 variable "tenancy_id" {