From fa6f029812145b36f403592c7ae8ae8726bb1855 Mon Sep 17 00:00:00 2001
From: djpbessems <danny@bessems.eu>
Date: Fri, 4 Jun 2021 22:31:04 +0200
Subject: [PATCH] Housekeeping; Add debugging information

---
 .drone.yml                       | 10 ++++++
 packer/windowsserver2019.pkr.hcl | 62 ++++++++++++++++----------------
 2 files changed, 41 insertions(+), 31 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 27797c3..ca9b017 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -11,6 +11,16 @@ volumes:
     name: flexvolsmb-drone-scratch
 
 steps:
+- name: Debugging information
+  image: bv11-cr01.bessems.eu/library/packer-extended
+  commands:
+  - |
+    set -x
+
+    yamllint --version
+    packer --version
+    pwsh --version
+    ovftool --version
 - name: Windows Server 2019
   image: bv11-cr01.bessems.eu/library/packer-extended
   commands:
diff --git a/packer/windowsserver2019.pkr.hcl b/packer/windowsserver2019.pkr.hcl
index f405611..fb63325 100644
--- a/packer/windowsserver2019.pkr.hcl
+++ b/packer/windowsserver2019.pkr.hcl
@@ -8,16 +8,16 @@ packer {
 }
 
 source "vsphere-iso" "srv2019-t" {
-  vcenter_server          = "${var.vcenter_server}"
-  username                = "${var.vsphere_username}"
-  password                = "${var.vsphere_password}"
+  vcenter_server          = var.vcenter_server
+  username                = var.vsphere_username
+  password                = var.vsphere_password
   insecure_connection     = "true"
 
   vm_name                 = "${var.vm_guestos}-${var.vm_name}-t"
-  datacenter              = "${var.vsphere_datacenter}"
-  host                    = "${var.vsphere_host}"
-  folder                  = "${var.vsphere_folder}"
-  datastore               = "${var.vsphere_datastore}"
+  datacenter              = var.vsphere_datacenter
+  host                    = var.vsphere_host
+  folder                  = var.vsphere_folder
+  datastore               = var.vsphere_datastore
 
   guest_os_type           = "windows9Server64Guest"
 
@@ -27,14 +27,14 @@ source "vsphere-iso" "srv2019-t" {
 
   communicator            = "winrm"
   winrm_username          = "administrator"
-  winrm_password          = "${var.winrm_password}"
+  winrm_password          = var.winrm_password
   winrm_timeout           = "10m"
 
   RAM                     = 8192
   CPUs                    = 2
 
   network_adapters {
-    network               = "${var.vsphere_network}"
+    network               = var.vsphere_network
     network_card          = "vmxnet3"
   }
   storage {
@@ -69,16 +69,16 @@ source "vsphere-iso" "srv2019-t" {
 }
 
 source "vsphere-iso" "srv2019-v" {
-  vcenter_server          = "${var.vcenter_server}"
-  username                = "${var.vsphere_username}"
-  password                = "${var.vsphere_password}"
+  vcenter_server          = var.vcenter_server
+  username                = var.vsphere_username
+  password                = var.vsphere_password
   insecure_connection     = "true"
 
   vm_name                 = "${var.vm_guestos}-${var.vm_name}-v"
-  datacenter              = "${var.vsphere_datacenter}"
-  host                    = "${var.vsphere_host}"
-  folder                  = "${var.vsphere_folder}"
-  datastore               = "${var.vsphere_datastore}"
+  datacenter              = var.vsphere_datacenter
+  host                    = var.vsphere_host
+  folder                  = var.vsphere_folder
+  datastore               = var.vsphere_datastore
 
   guest_os_type           = "windows9Server64Guest"
   
@@ -87,7 +87,7 @@ source "vsphere-iso" "srv2019-v" {
   boot_wait               = "5m"
 
   communicator            = "winrm"
-  winrm_password          = "${var.winrm_password}"
+  winrm_password          = var.winrm_password
   winrm_timeout           = "10m"
   winrm_username          = "administrator"
 
@@ -95,7 +95,7 @@ source "vsphere-iso" "srv2019-v" {
   CPUs                    = 2
 
   network_adapters {
-    network               = "${var.vsphere_network}"
+    network               = var.vsphere_network
     network_card          = "vmxnet3"
   }
   storage {
@@ -183,17 +183,17 @@ build {
     post-processor "vsphere" {
       only                = ["srv2019-t"]
 
-      host                = "${var.vcenter_server}"
-      username            = "${var.vsphere_username}"
-      password            = "${var.vsphere_password}"
+      host                = var.vcenter_server
+      username            = var.vsphere_username
+      password            = var.vsphere_password
       insecure            = true
 
       vm_name             = "Windows-Server-2019-LTSC"
-      datacenter          = "${var.vsphere_datacenter}"
-      cluster             = "${var.vsphere_host}"
-      vm_folder           = "${var.vsphere_templatefolder}"
-      vm_network          = "${var.vsphere_network}"
-      datastore           = "${var.vsphere_datastore}"
+      datacenter          = var.vsphere_datacenter
+      cluster             = var.vsphere_host
+      vm_folder           = var.vsphere_templatefolder
+      vm_network          = var.vsphere_network
+      datastore           = var.vsphere_datastore
       disk_mode           = "thin"
 
       keep_input_artifact = true
@@ -202,13 +202,13 @@ build {
     post-processor "vsphere-template" {
       only          = ["srv2019-t"]
 
-      host          = "${var.vcenter_server}"
-      username      = "${var.vsphere_username}"
-      password      = "${var.vsphere_password}"
+      host          = var.vcenter_server
+      username      = var.vsphere_username
+      password      = var.vsphere_password
       insecure      = true
 
-      datacenter    = "${var.vsphere_datacenter}"
-      folder        = "${var.vsphere_templatefolder}"
+      datacenter    = var.vsphere_datacenter
+      folder        = var.vsphere_templatefolder
 
       reregister_vm = false
     }