Merge branch 'main' into update_to_6.4.0

fortinet · May 31, 2023 · 52e3412 · 52e3412
2 parents 227c5c8 + beffc2f
commit 52e3412
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -26,4 +26,6 @@ scripts/clean-code.js
 azure_funcapp/host.json
 
 # aws_cloudformation
-autoscale_params.txt
+autoscale_params.txt
+
+.terraform*
diff --git a/image.tf b/image.tf
@@ -5,7 +5,7 @@ resource "ibm_is_image" "vnf_custom_image" {
  href = var.image
  name = "${var.CLUSTER_NAME}-fortigate-custom-image-${random_string.random_suffix.result}"
  operating_system = "ubuntu-18-04-amd64"
-
+ resource_group = data.ibm_resource_group.rg.id
 
  timeouts {
  create = "60m"

diff --git a/vars.tf b/vars.tf
@@ -135,6 +135,15 @@ variable "SECURITY_GROUP" {
  description = "The Security Group to attach to the FortiGate instance Network Interfaces."
 }
 
+variable "RESOURCE_GRP" {
+ type = string
+ default = "Default"
+ description = "The RESOURCE Group Name to attach to the FortiGate instances."
+}
+
+data "ibm_resource_group" "rg" {
+ name = var.RESOURCE_GRP
+}
 
 // For easy identification, the name of the cluster uses the format cluster-name-resource-randomSuffix."
 // Name must be lowercase.