updated base module to use operator 2.1 so we can use OL8 for operator (#83)

Also updated docs and default networking values for bastion and operator subnets

Author: hyder

CHANGELOG.adoc

@@ -7,6 +7,9 @@ All notable changes to this project are documented in this file.
 
 The format is based on {uri-changelog}[Keep a Changelog].
 
+== 2.1.0 (March 22, 2021)
+* Upgraded module to use operator 2.1 so we can use OL8 for operator
+
 == 2.0.0 (December 8, 2020)
 * Set minimum version to Terraform 0.13 (#78)
 * Use all Terraform 0.13 submodules (#80)

docs/terraformoptions.adoc

@@ -187,24 +187,24 @@ Configuration Terraform Options:
 |The difference between the VCN's netmask and the desired subnets' masks specified in the form of a map. The values of the map are used as the newbits parameter in the {uri-terraform-cidrsubnet}[cidrsubnet] Terraform function to calculate each subnet's mask.
 |[source]
 ----
-13
+14
 ----
 |
 [source]
 ----
-13
+14
 ----
 
 |`netnum`
 |0-based index of the subnet when the VCN's CIDR is masked with the corresponding newbit value and specified in the form of a map. Used to define the boundaries of the subnet. The values of the map are used as the netnum parameter in the {uri-terraform-cidrsubnet}[cidrsubnet] Terraform function.
 |[source]
 ----
-32
+0
 ----
 |
 [source]
 ----
-32
+0
 ----
 
 |`notification_enabled`
@@ -280,6 +280,30 @@ tags = {
 |true/false
 |false
 
+|`newbits`
+|The difference between the VCN's netmask and the desired subnets' masks specified in the form of a map. The values of the map are used as the newbits parameter in the {uri-terraform-cidrsubnet}[cidrsubnet] Terraform function to calculate each subnet's mask.
+|[source]
+----
+14
+----
+|
+[source]
+----
+14
+----
+
+|`netnum`
+|0-based index of the subnet when the VCN's CIDR is masked with the corresponding newbit value and specified in the form of a map. Used to define the boundaries of the subnet. The values of the map are used as the netnum parameter in the {uri-terraform-cidrsubnet}[cidrsubnet] Terraform function.
+|[source]
+----
+0
+----
+|
+[source]
+----
+0
+----
+
 |`notification_enabled`
 |Whether to enable ONS notification for the operator host. *Do not enable for now*.
 |true/false
@@ -320,6 +344,22 @@ tags = {
   boot_volume_size=50
 }`
 
+|`operating_system_version`
+|The Oracle Linux version.
+|"8"
+|"8"
+
+|`ssh_private_key_path`
+|path to ssh private key. This ssh key is used to authenticate and log into the bastion host. Must be the private key of the public key provided below. *Required* if bastion is enabled.
+
+|
+|None
+
+|`ssh_public_key_path`
+|path to ssh public key. The ssh key is used when provisioning the bastion host. Must be the public key of the private key provided above. *Required* if bastion is enabled.
+|
+|None
+
 |`tags`
 |The tags to apply on the bastion resources.
 |map(any)

main.tf

@@ -67,7 +67,7 @@ module "bastion" {
 
 module "operator" {
   source  = "oracle-terraform-modules/operator/oci"
-  version = "2.0.0"
+  version = "2.1.0"
 
   # provider identity parameters
   api_fingerprint      = var.oci_base_provider.api_fingerprint
@@ -92,6 +92,7 @@ module "operator" {
   operator_image_id           = var.oci_base_operator.operator_image_id
   operator_instance_principal = var.oci_base_operator.enable_instance_principal
   operator_shape              = var.oci_base_operator.operator_shape
+  operating_system_version    = var.oci_base_operator.operating_system_version
   operator_upgrade            = var.oci_base_operator.operator_upgrade
   ssh_public_key              = var.oci_base_operator.ssh_public_key
   ssh_public_key_path         = var.oci_base_operator.ssh_public_key_path

terraform.tfvars.example

@@ -45,8 +45,8 @@ oci_base_bastion = {
     boot_volume_size=50
   }
   bastion_upgrade       = true
-  netnum                = 32
-  newbits               = 13
+  netnum                = 0
+  newbits               = 14
   notification_enabled  = false
   notification_endpoint = ""
   notification_protocol = "EMAIL"
@@ -74,10 +74,11 @@ oci_base_operator = {
     memory=4,
     boot_volume_size=50
   }
+  operating_system_version  = "8"
   operator_upgrade          = false
   enable_instance_principal = true
-  netnum                    = 33
-  newbits                   = 13
+  netnum                    = 1
+  newbits                   = 14
   notification_enabled      = false
   notification_endpoint     = ""
   notification_protocol     = "EMAIL"

variables.tf

@@ -84,8 +84,8 @@ variable "oci_base_bastion" {
       boot_volume_size = 50
     }
     bastion_upgrade       = true
-    netnum                = 13
-    newbits               = 32
+    netnum                = 0
+    newbits               = 14
     notification_enabled  = false
     notification_endpoint = ""
     notification_protocol = "EMAIL"
@@ -108,6 +108,7 @@ variable "oci_base_operator" {
     operator_enabled          = bool
     operator_image_id         = string
     operator_shape            = map(any)
+    operating_system_version  = string
     operator_upgrade          = bool
     enable_instance_principal = bool
     netnum                    = number
@@ -134,10 +135,11 @@ variable "oci_base_operator" {
       memory           = 4,
       boot_volume_size = 50
     }
+    operating_system_version  = "8"
     operator_upgrade          = true
     enable_instance_principal = false
-    netnum                    = 33
-    newbits                   = 13
+    netnum                    = 1
+    newbits                   = 14
     notification_enabled      = false
     notification_endpoint     = ""
     notification_protocol     = "EMAIL"