fix: deployment

Makefile

@@ -14,14 +14,14 @@ manifests/d2iq-base-%$(NAME_POSTFIX).json: packer.initialized vsphere.pkr.hcl $(
 
 .PHONY: manifests/d2iq-base-%$(NAME_POSTFIX).json.clean
 manifests/d2iq-base-%$(NAME_POSTFIX).json.clean: manifests/d2iq-base-%$(NAME_POSTFIX).json
-	bash -x mkinclude/helper_deletetemplate.sh $(shell jq -r '.builds[0].custom_data.template' $<)
+	bash -x mkinclude/helper_deletetemplate.sh $(shell jq -r '.builds[0].custom_data.template' $<) "" $(shell jq -r '.builds[0].custom_data.resource_pool' $<)
 	mv $< $@
 
 manifests/tests/d2iq-base-%$(NAME_POSTFIX).json: manifests/d2iq-base-%$(NAME_POSTFIX).json clone-test.pkr.hcl
 	$(PACKER) build -force -var vsphere_folder=$(VSPHERE_FOLDER) -var vm_name=test-$(shell basename -s .json $<) -var template_manifest=$< -var manifest_output=$@ -on-error="$(PACKER_ON_ERROR)" clone-test.pkr.hcl
 
 manifests/ovf/d2iq-base-%$(NAME_POSTFIX).ovf: manifests/d2iq-base-%$(NAME_POSTFIX).json
-	bash mkinclude/helper_markasvm.sh $(VSPHERE_FOLDER)/d2iq-base-$*
+	bash mkinclude/helper_markasvm.sh $(VSPHERE_FOLDER)/d2iq-base-$* "" $(shell jq -r '.builds[0].custom_data.resource_pool' $<)
 	$(GOVC) export.ovf -dc=$(shell jq -r '.builds[0].custom_data.datacenter' $<) -vm=$(VSPHERE_FOLDER)/$(shell jq -r '.builds[0].custom_data.template_name' $<) $@
 	tar -czf $@.tar.gz $@/*
 
@@ -35,7 +35,7 @@ manifests/tests/d2iq-base-%$(NAME_POSTFIX).json.clean: manifests/tests/d2iq-base
 
 .PHONY: release/d2iq-base-%$(NAME_POSTFIX)
 release/d2iq-base-%$(NAME_POSTFIX): manifests/d2iq-base-%$(NAME_POSTFIX).json
-	bash mkinclude/helper_deletetemplate.sh $(RELEASE_FOLDER)/d2iq-base-$* || true
+	bash mkinclude/helper_deletetemplate.sh $(RELEASE_FOLDER)/d2iq-base-$* "" $(shell jq -r '.builds[0].custom_data.resource_pool' $<)
 	$(GOVC) object.rename /$(shell jq -r '.builds[0].custom_data.datacenter' $<)/vm/$(shell jq -r '.builds[0].custom_data.template_name' $<) d2iq-base-$*
 	$(GOVC) object.mv /$(shell jq -r '.builds[0].custom_data.datacenter' $<)/vm/$(VSPHERE_FOLDER)/d2iq-base-$* /$(shell jq -r '.builds[0].custom_data.datacenter' $<)/vm/$(RELEASE_FOLDER)
 

mkinclude/helper_deletetemplate.sh

@@ -1,12 +1,15 @@
 #!/bin/bash
 DATACENTER=${DATACENTER:-$PKR_VAR_vsphere_datacenter}
+CLUSTER=${CLUSTER:-$PKR_VAR_vsphere_cluster}
 
 VM_NAME="${1}"
 VM_FOLDER="${2}"
+VM_POOL="${3}"
 
 
 VMBASEPATH="/${DATACENTER}/vm/${VM_FOLDER}"
 VMPATH="${VMBASEPATH%%/}/${VM_NAME}"
+POOLPATH="/${DATACENTER}/host/${CLUSTER}/Resources/${VM_POOL}"
 
 # FIXME:  does not work.
 if ! govc vm.info "${VMPATH%%/}"; then
@@ -20,5 +23,11 @@ if [ "${esxhost}" == "" ]; then
     exit 0
 fi
 
-govc vm.markasvm -host="$esxhost" -dc="${DATACENTER}" "${VMPATH%%/}"
+# if VM_POOL is set inject the pool into the command
+if [ "${VM_POOL}" != "" ]; then
+    ADDOPT="-pool=${POOLPATH}"
+fi
+
+# shellcheck disable=SC2086
+govc vm.markasvm -host="$esxhost" -dc="${DATACENTER}" $ADDOPT "${VMPATH%%/}"
 govc vm.destroy "${VMPATH%%/}"

mkinclude/helper_markasvm.sh

@@ -3,6 +3,7 @@ DATACENTER=${DATACENTER:-$PKR_VAR_vsphere_datacenter}
 
 VM_NAME="${1}"
 VM_FOLDER="${2}"
+VM_POOL="${3}"
 
 
 VMBASEPATH="/${DATACENTER}/vm/${VM_FOLDER}"
@@ -20,4 +21,10 @@ if [ "${esxhost}" == "" ]; then
     exit 0
 fi
 
-govc vm.markasvm -host="$esxhost" -dc="${DATACENTER}" "${VMPATH%%/}"
+# if VM_POOL is set inject the pool into the command
+if [ "${VM_POOL}" != "" ]; then
+    ADDOPT="-pool=${VM_POOL}"
+fi
+
+# shellcheck disable=SC2086
+govc vm.markasvm -host="$esxhost" -dc="${DATACENTER}" $ADDOPT "${VMPATH%%/}"

vsphere.pkr.hcl

@@ -475,6 +475,7 @@ build {
       datacenter    = var.vsphere_datacenter
       distribution  = var.distribution
       distribution_version = var.distribution_version
+      resource_pool = var.vsphere_resource_pool
       bootconfig_type = var.bootconfig_type
     }
   }