added state and OS version for bastion host, renamed control variable… (#19)

* add State and OS version for bastion host

* add sort order on images
* add deprecation notice for bastion_enabled Input Variable


Co-authored-by: Çetin ARDAL <[email protected]>

Author: hyder

CHANGELOG.adoc

@@ -7,6 +7,24 @@ All notable changes to this project are documented in this file.
 
 The format is based on {uri-changelog}[Keep a Changelog].
 
+= Unreleased
+
+== New features
+* New variable (`bastion_operating_system_version`) to specify Autonomous Linux version (#15)
+* Added sort_order on images (#16)
+* New variable (`bastion_state`) to specify state of bastion host (#17)
+
+=== Deprecation notice
+
+The following variables will be renamed at the next major release of this module (related to #18):
+
+* var.bastion_enabled --> var.create_bastion
+
+= v2.0.0 (December 8, 2020)
+* Added support for flex shapes (#11)
+* Set default launch options to PARAVIRTUALIZED
+* Set minimum version to Terraform 0.13 (#12)
+
 = v1.0.7 (August 31,2020)
 * Reversed 1.04 and and 1.0.5 (#9)
 

compute.tf

@@ -46,6 +46,8 @@ resource "oci_core_instance" "bastion" {
     source_id               = local.bastion_image_id
   }
 
+  state = var.bastion_state
+  
   timeouts {
     create = "60m"
   }

datasources.tf

@@ -51,8 +51,10 @@ data "template_file" "autonomous_cloud_init_file" {
 data "oci_core_images" "autonomous_images" {
   compartment_id           = var.compartment_id
   operating_system         = "Oracle Autonomous Linux"
+  operating_system_version = var.bastion_operating_system_version
   shape                    = lookup(var.bastion_shape, "shape", "VM.Standard.E2.2")
   sort_by                  = "TIMECREATED"
+  sort_order               = "DESC"
 }
 
 # cloud init for bastion

docs/terraformoptions.adoc

@@ -105,12 +105,12 @@ Ensure you review the {uri-terraform-dependencies}[dependencies].
 |`netnum`
 |0-based index of the bastion subnet when the VCN's CIDR is masked with the corresponding newbit value.
 |
-|32
+|0
 
 |`newbits`
 |The difference between the VCN's netmask and the desired bastion subnet mask.
 |
-|13
+|14
 
 |`vcn_id`
 |The id of the VCN to use when creating the bastion resources. *Required*
@@ -138,6 +138,11 @@ Ensure you review the {uri-terraform-dependencies}[dependencies].
 |imageid/Autonomous
 |Autonomous
 
+|`bastion_operating_system_version`
+|In case Autonomous Linux is used, allow specification of Autonomous version
+|
+|7.9
+
 |`bastion_shape`
 |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 = {
@@ -153,6 +158,11 @@ Ensure you review the {uri-terraform-dependencies}[dependencies].
   boot_volume_size=50
 }`
 
+|`bastion_state`
+|The target state for the instance. Could be set to RUNNING or STOPPED. (Updatable)
+|RUNNING|STOPPED
+|RUNNING
+
 |`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.
 |true/false

terraform.tfvars.example

@@ -37,6 +37,8 @@ bastion_enabled = true
 
 bastion_image_id = "Autonomous"
 
+bastion_operating_system_version = "7.9"
+
 bastion_shape = {
   # shape = "VM.Standard.E2.2"
   shape="VM.Standard.E3.Flex",
@@ -45,6 +47,8 @@ bastion_shape = {
   boot_volume_size=50
 }
 
+bastion_state= "RUNNING"
+
 bastion_upgrade = false
 
 ssh_public_key = ""

variables.tf

@@ -66,13 +66,13 @@ variable "ig_route_id" {
 
 variable "netnum" {
   description = "0-based index of the bastion subnet when the VCN's CIDR is masked with the corresponding newbit value."
-  default     = 32
+  default     = 0
   type        = number
 }
 
 variable "newbits" {
   description = "The difference between the VCN's netmask and the desired bastion subnet mask"
-  default     = 13
+  default     = 14
   type        = number
 }
 
@@ -84,6 +84,7 @@ variable "vcn_id" {
 # bastion host parameters
 
 variable "bastion_enabled" {
+  #! Deprecation notice: will be renamed to create_bastion at next major release
   description = "whether to create the bastion"
   default     = false
   type        = bool
@@ -95,6 +96,12 @@ variable "bastion_image_id" {
   type        = string
 }
 
+variable "bastion_operating_system_version" {
+  description = "In case Autonomous Linux is used, allow specification of Autonomous version"
+  default     = "7.9"
+  type        = string
+}
+
 variable "bastion_shape" {
   description = "The shape of bastion instance."
   default     = {
@@ -109,6 +116,12 @@ variable "bastion_upgrade" {
   type        = bool
 }
 
+variable "bastion_state" {
+  description = "The target state for the instance. Could be set to RUNNING or STOPPED. (Updatable)"
+  default     = "RUNNING"
+  type        = string
+}
+
 variable "ssh_public_key" {
   description = "the content of the ssh public key used to access the bastion. set this or the ssh_public_key_path"
   default     = ""