From 9afbab22f89357feb6e775ff90297ae9b854f8b0 Mon Sep 17 00:00:00 2001
From: djpbessems <danny@bessems.eu>
Date: Wed, 31 Mar 2021 09:43:22 +0200
Subject: [PATCH] Fix variable declaration/assignment

---
 .drone.yml               | 5 +++--
 terraform/vsphere.tfvars | 5 ++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index e65cec0..80becdb 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -11,6 +11,7 @@ steps:
       -upgrade \
       -input=false \
       -backend-config="conn_str=$${PG_CONNECTIONSTRING}"
+  - cat terraform/.terraform.lock.hcl
   environment:
     PG_CONNECTIONSTRING: postgres://terraform:terraform@tfstate.default.svc.cluster.local/terraform_backend?sslmode=disable
     TF_AUTOMATION: yes
@@ -20,8 +21,8 @@ steps:
   commands:
   - |
     terraform -chdir=terraform plan \
-      -var="vsphere_password=$${VSPHERE_PASSWORD}" -var="repo_username=$${REPO_USERNAME}" -var="repo_password=$${REPO_PASSWORD}" -var="adds_password=$${ADDS_PASSWORD}"\
-      -var-file='vsphere.tfvars' \
+      -var="hv_password=$${VSPHERE_PASSWORD}" -var="repo_username=$${REPO_USERNAME}" -var="repo_password=$${REPO_PASSWORD}" -var="adds_password=$${ADDS_PASSWORD}"\
+      -var-file='vsphere.tfvars' -var-file='vm.tfvars' \
       -input=false \
       -out=terraform.plan
   environment:
diff --git a/terraform/vsphere.tfvars b/terraform/vsphere.tfvars
index 8f8581b..d2c9352 100644
--- a/terraform/vsphere.tfvars
+++ b/terraform/vsphere.tfvars
@@ -1,9 +1,8 @@
-hv_server         = "bv11-vc01.bessems.lan"
+hv_fqdn           = "bv11-vc01.bessems.lan"
 hv_username       = "administrator@vsphere.local"
 hv_datacenter     = "DeSchakel"
 hv_host           = "bv11-esx.bessems.eu"
 hv_hostip         = "192.168.11.200"
-hv_vmdatastore    = "Datastore02.SSD"
-hv_cldatastore    = "Datastore01.NAS"
+hv_datastore      = "Datastore02.SSD"
 hv_vmfolder       = "/Terraform"
 hv_network        = "Isolated"