Replaced template_cloudinit_config with cloudinit_config

garutilorenzo · garutilorenzo · commit e8cbb58799de · 2023-01-30T11:27:55.000+01:00
diff --git a/examples/.terraform.lock.hcl b/examples/.terraform.lock.hcl
diff --git a/instance-pool/data.tf b/instance-pool/data.tf
@@ -1,4 +1,4 @@
-data "template_cloudinit_config" "ubuntu_init" {
+data "cloudinit_config" "ubuntu_init" {
   gzip          = true
   base64_encode = true
 
diff --git a/instance-pool/instancepool.tf b/instance-pool/instancepool.tf
@@ -5,7 +5,7 @@ resource "oci_core_instance_pool" "ubuntu_instance_pool" {
     ignore_changes        = [load_balancers, freeform_tags]
   }
 
-  display_name              = "ubuntu-instance-pool"
+  display_name              = var.instance_pool_name
   compartment_id            = var.compartment_ocid
   instance_configuration_id = oci_core_instance_configuration.ubuntu_template.id
 
diff --git a/instance-pool/template.tf b/instance-pool/template.tf
@@ -41,7 +41,7 @@ resource "oci_core_instance_configuration" "ubuntu_template" {
 
       metadata = {
         "ssh_authorized_keys" = file(var.PATH_TO_PUBLIC_KEY)
-        "user_data"           = data.template_cloudinit_config.ubuntu_init.rendered
+        "user_data"           = data.cloudinit_config.ubuntu_init.rendered
       }
 
       shape = "VM.Standard.A1.Flex"
diff --git a/instance-pool/vars.tf b/instance-pool/vars.tf
@@ -49,4 +49,9 @@ variable "os_image_id" {
 variable "instance_pool_size" {
   type    = number
   default = 2
+}
+
+variable "instance_pool_name" {
+  type    = string
+  default = "ubuntu-instance-pool"
 }
diff --git a/nat-instance/data.tf b/nat-instance/data.tf
@@ -1,4 +1,4 @@
-data "template_cloudinit_config" "nat_instance_init" {
+data "cloudinit_config" "nat_instance_init" {
   gzip          = true
   base64_encode = true
 
diff --git a/nat-instance/nat_instance.tf b/nat-instance/nat_instance.tf
@@ -44,7 +44,7 @@ resource "oci_core_instance" "nat_instance" {
 
   metadata = {
     "ssh_authorized_keys" = file(var.PATH_TO_PUBLIC_KEY)
-    "user_data"           = data.template_cloudinit_config.nat_instance_init.rendered
+    "user_data"           = data.cloudinit_config.nat_instance_init.rendered
   }
 
   shape = "VM.Standard.A1.Flex"
diff --git a/simple-instance/compute.tf b/simple-instance/compute.tf
@@ -43,7 +43,7 @@ resource "oci_core_instance" "ubuntu_oci_instance" {
 
   metadata = {
     "ssh_authorized_keys" = file(var.PATH_TO_PUBLIC_KEY)
-    "user_data"           = data.template_cloudinit_config.ubuntu_init.rendered
+    "user_data"           = data.cloudinit_config.ubuntu_init.rendered
   }
 
   shape = "VM.Standard.A1.Flex"
diff --git a/simple-instance/data.tf b/simple-instance/data.tf
@@ -1,4 +1,4 @@
-data "template_cloudinit_config" "ubuntu_init" {
+data "cloudinit_config" "ubuntu_init" {
   gzip          = true
   base64_encode = true
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-data "template_cloudinit_config" "ubuntu_init" {`
	`1`	`+data "cloudinit_config" "ubuntu_init" {`
`2`	`2`	`gzip = true`
`3`	`3`	`base64_encode = true`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ resource "oci_core_instance_pool" "ubuntu_instance_pool" {`
`5`	`5`	`ignore_changes = [load_balancers, freeform_tags]`
`6`	`6`	`}`
`7`	`7`
`8`		`- display_name = "ubuntu-instance-pool"`
	`8`	`+ display_name = var.instance_pool_name`
`9`	`9`	`compartment_id = var.compartment_ocid`
`10`	`10`	`instance_configuration_id = oci_core_instance_configuration.ubuntu_template.id`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ resource "oci_core_instance_configuration" "ubuntu_template" {`
`41`	`41`
`42`	`42`	`metadata = {`
`43`	`43`	`"ssh_authorized_keys" = file(var.PATH_TO_PUBLIC_KEY)`
`44`		`- "user_data" = data.template_cloudinit_config.ubuntu_init.rendered`
	`44`	`+ "user_data" = data.cloudinit_config.ubuntu_init.rendered`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`shape = "VM.Standard.A1.Flex"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-data "template_cloudinit_config" "nat_instance_init" {`
	`1`	`+data "cloudinit_config" "nat_instance_init" {`
`2`	`2`	`gzip = true`
`3`	`3`	`base64_encode = true`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ resource "oci_core_instance" "nat_instance" {`
`44`	`44`
`45`	`45`	`metadata = {`
`46`	`46`	`"ssh_authorized_keys" = file(var.PATH_TO_PUBLIC_KEY)`
`47`		`- "user_data" = data.template_cloudinit_config.nat_instance_init.rendered`
	`47`	`+ "user_data" = data.cloudinit_config.nat_instance_init.rendered`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`shape = "VM.Standard.A1.Flex"`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ resource "oci_core_instance" "ubuntu_oci_instance" {`
`43`	`43`
`44`	`44`	`metadata = {`
`45`	`45`	`"ssh_authorized_keys" = file(var.PATH_TO_PUBLIC_KEY)`
`46`		`- "user_data" = data.template_cloudinit_config.ubuntu_init.rendered`
	`46`	`+ "user_data" = data.cloudinit_config.ubuntu_init.rendered`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`shape = "VM.Standard.A1.Flex"`