From dc66d7ce605d2c00fb6bdbf88c9ae36fea7b0ee4 Mon Sep 17 00:00:00 2001
From: djpbessems <danny@bessems.eu>
Date: Tue, 2 Feb 2021 13:30:06 +0100
Subject: [PATCH] Fix syntax wrt variables & provider

---
 terraform/main.tf      |  9 +++++++--
 terraform/variables.tf | 38 ++++++++++++--------------------------
 2 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/terraform/main.tf b/terraform/main.tf
index 7b489e3..10f465f 100644
--- a/terraform/main.tf
+++ b/terraform/main.tf
@@ -1,10 +1,15 @@
 terraform {
   backend "pg" {}
+
+  required_providers {
+    vsphere = {
+      source  = "hashicorp/vsphere"
+      version = "~> 1.24.3"
+    }
+  }
 }
 
 provider "vsphere" {
-    version              = "1.24.1"
-
     vsphere_server       = var.vcenter_server
     user                 = var.vsphere_username
     password             = var.vsphere_password
diff --git a/terraform/variables.tf b/terraform/variables.tf
index f0f51c1..fca5972 100644
--- a/terraform/variables.tf
+++ b/terraform/variables.tf
@@ -1,29 +1,15 @@
-variable "vcenter_server" {
-}
+variable "vcenter_server" {}
+variable "vsphere_username" {}
+variable "vsphere_password" {}
 
-variable "vsphere_username" {
-}
+variable "vsphere_datacenter" {}
+variable "vsphere_host" {}
+variable "vsphere_hostip" {}
 
-variable "vsphere_password" {
-}
+variable "vsphere_vmdatastore" {}
+variable "vsphere_cldatastore" {}
+variable "vsphere_vmfolder" {}
+variable "vsphere_network" {}
 
-variable "vsphere_datacenter" {
-}
-
-variable "vsphere_host" {
-}
-
-variable "vsphere_hostip" {
-}
-
-variable "vsphere_datastore" {
-}
-
-variable "vsphere_folder" {
-}
-
-variable "vsphere_templatefolder" {
-}
-
-variable "vsphere_network" {
-}
\ No newline at end of file
+variable "repo_username" {}
+variable "repo_password" {}
\ No newline at end of file