chore: update to compute module v2.2.0

CHANGELOG.md

@@ -10,6 +10,12 @@ Given a version number MAJOR.MINOR.PATCH:
 - MINOR version when adding functionality in a backwards compatible manner,
 - PATCH version when making backwards compatible bug fixes.
 
+## [0.2.1] - 2021-10-08
+
+### Changed
+
+- Compute module bumped to v2.2.0
+
 ## [0.2.0] - 2021-10-06
 
 ### Changed

README.md

@@ -30,7 +30,7 @@ This module deploys an instance with the necessary tools to start developing Inf
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_instance_iacbox"></a> [instance\_iacbox](#module\_instance\_iacbox) | oracle-terraform-modules/compute-instance/oci | 2.2.0-RC1 |
+| <a name="module_instance_iacbox"></a> [instance\_iacbox](#module\_instance\_iacbox) | oracle-terraform-modules/compute-instance/oci | 2.2.0 |
 | <a name="module_vcn_iacbox"></a> [vcn\_iacbox](#module\_vcn\_iacbox) | oracle-terraform-modules/vcn/oci | 3.0.0 |
 ## Resources
 
@@ -59,7 +59,7 @@ This module deploys an instance with the necessary tools to start developing Inf
 | <a name="input_source_ocid"></a> [source\_ocid](#input\_source\_ocid) | The OCID of an image or a boot volume to use, depending on the value of source\_type. | `string` | n/a | yes |
 | <a name="input_source_type"></a> [source\_type](#input\_source\_type) | The source type for the instance. | `string` | `"image"` | no |
 | <a name="input_ssh_authorized_keys"></a> [ssh\_authorized\_keys](#input\_ssh\_authorized\_keys) | DEPRECATED: use ssh\_public\_key or ssh\_public\_key\_path instead. Public SSH keys path to be included in the ~/.ssh/authorized\_keys file for the default user on the instance. | `string` | `null` | no |
-| <a name="input_ssh_public_key"></a> [ssh\_public\_key](#input\_ssh\_public\_key) | The content of the ssh public key used to access the compute instance. Set this, or ssh\_public\_key\_path to add multiple keys at once. | `string` | `null` | no |
+| <a name="input_ssh_public_keys"></a> [ssh\_public\_keys](#input\_ssh\_public\_keys) | Public SSH keys to be included in the ~/.ssh/authorized\_keys file for the default user on the instance. To provide multiple keys, see docs/instance\_ssh\_keys.adoc. | `string` | `null` | no |
 | <a name="input_tenancy_ocid"></a> [tenancy\_ocid](#input\_tenancy\_ocid) | n/a | `string` | `null` | no |
 | <a name="input_user_data"></a> [user\_data](#input\_user\_data) | Provide your own base64-encoded data to be used by Cloud-Init to run custom scripts or provide custom Cloud-Init configuration. | `string` | `null` | no |
 | <a name="input_user_ocid"></a> [user\_ocid](#input\_user\_ocid) | n/a | `string` | `null` | no |

main.tf

@@ -41,12 +41,11 @@ resource "oci_core_subnet" "vcn_iacbox_public" {
 
 module "instance_iacbox" {
   source  = "oracle-terraform-modules/compute-instance/oci"
-  version = "2.2.0-RC1"
+  version = "2.2.0"
 
   # general oci parameters
   compartment_ocid = var.compartment_id
-  # freeform_tags    = var.freeform_tags
-  # defined_tags     = var.defined_tags
+  freeform_tags    = var.freeform_tags
   # compute instance parameters
   ad_number                   = var.instance_ad_number
   instance_count              = var.instance_count
@@ -57,8 +56,8 @@ module "instance_iacbox" {
   instance_flex_memory_in_gbs = var.instance_flex_memory_in_gbs # only used if shape is Flex type
   instance_flex_ocpus         = var.instance_flex_ocpus         # only used if shape is Flex type
   # operating system parameters
-  ssh_public_key = var.ssh_public_key
-  user_data      = filebase64(var.user_data)
+  ssh_public_keys = var.ssh_public_keys
+  user_data       = filebase64(var.user_data)
   # networking parameters
   assign_public_ip = var.assign_public_ip
   subnet_ocids     = [oci_core_subnet.vcn_iacbox_public.id] # var.subnet_ocids

release-notes/relnote-v0.2.1.md

@@ -0,0 +1,5 @@
+# 2021-10-08
+
+## Changes
+
+Bumped Compute module to v2.2.0

variables.tf

@@ -116,8 +116,8 @@ variable "ssh_authorized_keys" {
   default     = null
 }
 
-variable "ssh_public_key" {
-  description = "The content of the ssh public key used to access the compute instance. Set this, or ssh_public_key_path to add multiple keys at once."
+variable "ssh_public_keys" {
+  description = "Public SSH keys to be included in the ~/.ssh/authorized_keys file for the default user on the instance. To provide multiple keys, see docs/instance_ssh_keys.adoc."
   type        = string
   default     = null
 }