From 66b2e316ef588cfde9c9662bfc1de57a0e4f494d Mon Sep 17 00:00:00 2001
From: Trygve Laugstøl <trygvis@inamo.no>
Date: Tue, 30 Jul 2019 22:51:20 +0200
Subject: o Nodes doesn't need public IPs.

---
 terraform/ansible/inventory | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'terraform/ansible/inventory')

diff --git a/terraform/ansible/inventory b/terraform/ansible/inventory
index 880397a..f3d4239 100755
--- a/terraform/ansible/inventory
+++ b/terraform/ansible/inventory
@@ -3,21 +3,26 @@
 read -r -d '' script <<'EOF'
 to_entries|map({(.key|tostring):.value.value})|add as $input |
 
-$input.k8s_node_names|to_entries|map({(.value):{
-  ansible_host:$input.k8s_node_public_ips[.key],
-  private_ip:$input.k8s_node_private_ips[.key]}
-  }) as $nodes |
-
 {
   ansible_host:$input.k8s_master_ip.public_ip,
   private_ip:$input.k8s_master_ip.private_ip,
 } as $master |
 
+$input.k8s_node_names|to_entries|map({(.value):{
+  ansible_host:$input.k8s_node_private_ips[.key],
+  private_ip:$input.k8s_node_private_ips[.key],
+  }) as $nodes |
+
 {_meta:{
   hostvars:([{"k8s-master": $master}]+$nodes|add)},
   all:(["k8s-master"] + ($input.k8s_node_names)),
   k8s:(["k8s-master"] + ($input.k8s_node_names)),
-  "k8s-nodes":$input.k8s_node_names,
+  "k8s-nodes":{
+      "hosts": $input.k8s_node_names,
+      "vars": {
+          "ansible_ssh_common_args": (["-J ", $input.k8s_master_ip.public_ip]|add)
+      }
+  }
 }
 EOF
 
-- 
cgit v1.2.3