oVirt: remove tmp template VM on bootstrap phase

This patch breaks the dependency between terraform resources:
releaseimage_template  and tmp_import_vm

allowing us to remove the tmp vm during the bootstrap phase

Signed-off-by: Gal-Zaidman <gzaidman@redhat.com>

data/data/ovirt/template/main.tf

@@ -59,15 +59,23 @@ resource "ovirt_vm" "tmp_import_vm" {
   depends_on = [ovirt_image_transfer.releaseimage]
 }
 
+data "ovirt_vms" "tmp_import_vm_data" {
+  count = length(local.existing_id) == 0 ? 1 : 0
+  search = {
+    criteria       = "name=tmpvm-for-${ovirt_image_transfer.releaseimage.0.alias}"
+    case_sensitive = true
+  }
+  depends_on = [ovirt_vm.tmp_import_vm]
+}
+
 resource "ovirt_template" "releaseimage_template" {
   // create the template only when we don't have an existing template
   count = length(local.existing_id) == 0 ? 1 : 0
   // name the template after the openshift cluster id
   name       = var.openstack_base_image_name
-  cluster_id = ovirt_vm.tmp_import_vm.0.cluster_id
+  cluster_id = data.ovirt_vms.tmp_import_vm_data.0.vms.0.cluster_id
   // create from vm
-  vm_id      = ovirt_vm.tmp_import_vm.0.id
-  depends_on = [ovirt_vm.tmp_import_vm]
+  vm_id = data.ovirt_vms.tmp_import_vm_data.0.vms.0.id
 }
 
 // finally get the template by name(should be unique), fail if it doesn't exist

pkg/destroy/bootstrap/bootstrap.go

@@ -14,6 +14,7 @@ import (
 	"github.com/openshift/installer/pkg/types/gcp"
 	"github.com/openshift/installer/pkg/types/libvirt"
 	"github.com/openshift/installer/pkg/types/openstack"
+	"github.com/openshift/installer/pkg/types/ovirt"
 	"github.com/pkg/errors"
 )
 
@@ -79,6 +80,8 @@ func Destroy(dir string) (err error) {
 		if err != nil {
 			return errors.Wrapf(err, "Failed to delete glance image %s", imageName)
 		}
+	case ovirt.Name:
+		extraArgs = append(extraArgs, "-target=module.template.ovirt_vm.tmp_import_vm")
 	}
 
 	extraArgs = append(extraArgs, "-target=module.bootstrap")