Added Output to sanity and cleaned up README

Terraform-VMWare-Modules · Jun 5, 2021 · 33419b6 · 33419b6
1 parent 8017703
commit 33419b6
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -125,11 +125,11 @@ module "example-server-windowsvm-advanced" {
 }
 
 output "vmnames" {
-  value = "${module.example-server-windowsvm-advanced.Windows-VM}"
+  value = module.example-server-windowsvm-advanced.VM
 }
 
 output "vmnameswip" {
-  value = "${module.example-server-windowsvm-advanced.Windows-ip}"
+  value = module.example-server-windowsvm-advanced.ip
 }
 ```
 

diff --git a/tests/sanity/.terraform.lock.hcl b/tests/sanity/.terraform.lock.hcl
diff --git a/tests/sanity/apply.sh b/tests/sanity/apply.sh
@@ -0,0 +1,4 @@
+terraform init
+terraform fmt
+terraform validate
+terraform apply -var-file="private.tfvars"
diff --git a/tests/sanity/cleanup.sh b/tests/sanity/cleanup.sh
@@ -0,0 +1,3 @@
+terraform destroy -var-file=private.tfvars
+rm terraform.tfstate terraform.tfstate.backup .terraform.lock.hcl
+rm -rf .terraform
diff --git a/tests/sanity/main.tf b/tests/sanity/main.tf
@@ -56,3 +56,14 @@ module "example-server-basic" {
   data_disk        = each.value.data_disk
 }
 
+output "DC_ID" {
+  value = tomap({
+    for k, i in module.example-server-basic : k => i.DC_ID
+  })
+}
+
+output "VM" {
+  value = tomap({
+    for k, i in module.example-server-basic : k => i.VM
+  })
+}
diff --git a/tests/smoke/main.tf b/tests/smoke/main.tf
@@ -12,7 +12,6 @@ variable "vm" {
     network          = map(list(string))
     vmgateway        = string
     dns_servers      = list(string)
-    data_disk        = map(map(string))
   }))
 }
 
@@ -30,5 +29,4 @@ module "example-server-basic" {
   vmgateway        = each.value.vmgateway
   dc               = each.value.dc
   datastore        = each.value.datastore #Either
-  data_disk        = each.value.data_disk
 }