Fix some more

Author: cmd-ntrf

common/configuration/main.tf

@@ -142,7 +142,7 @@ output "terraform_facts" {
 }
 
 output "puppetservers" {
-  value = { for host, values in local.final_inventory : host => values.local_ip if contains(values.tags, "puppet") }
+  value = { for host, values in local.final_inventory : host => { local_ip = values.local_ip, public_ip = values.public_ip } if contains(values.tags, "puppet") }
 }
 
 output "guest_passwd" {

common/provision/main.tf

@@ -74,7 +74,7 @@ resource "terraform_data" "deploy_puppetserver_files" {
     bastion_user        = "tf"
     bastion_private_key = var.configuration.ssh_key.private
     user                = "tf"
-    host                = each.value
+    host                = local.puppetservers_are_bastion ? each.value.public_ip : each.value.local_ip
     private_key         = var.configuration.ssh_key.private
   }