Catalog Template Updates (#6)

vsi-validation/main.tf

@@ -1,7 +1,12 @@
 resource "ibm_is_instance" "validation_instance" {
+  provider = catalog
   name    = var.vsi_instance_name
-  image   = var.vsi_id
   profile = var.vpc_profile
+
+  catalog_offering {
+    version_crn = var.version_crn
+    plan_crn = var.plan_crn
+  }
 
   primary_network_interface {
     subnet = var.subnet_id
@@ -23,4 +28,4 @@ resource "ibm_is_instance" "validation_instance" {
     update = "15m"
     delete = "15m"
   }
-}
+}

vsi-validation/variables.tf

@@ -3,11 +3,17 @@ variable "vsi_instance_name" {
     type = string
 }
 
-variable "vsi_id" {
-    description = "ID of VSI to deploy"
+variable "version_crn" {
+    description = "CRN of the Catalog version to deploy"
     type = string
 }
 
+variable "plan_crn" {
+    description = "CRN of the Catalog plan to deploy"
+    type = string
+    default = ""
+}
+
 variable "vpc_profile" {
     description = "Profile of VPC"
     type = string
@@ -36,4 +42,4 @@ variable "ssh_key_id" {
 variable "resource_group" {
     description = "Resource group to provision VSI with"
     type = string
-}
+}

vsi-validation/versions.tf

@@ -1,8 +1,8 @@
 terraform {
     required_providers {
-        ibm = {
-            source = "IBM-Cloud/ibm"
-            version = "~> 1.39.0"
+        catalog = {
+            source = "jonwoodlief/catalog"
+            version = "~> 3.1.3"
         }
     }
-}
+}