summaryrefslogtreecommitdiff
path: root/j2
diff options
context:
space:
mode:
Diffstat (limited to 'j2')
-rw-r--r--j2/terraform-machine-outputs.j27
-rw-r--r--j2/terraform-machine.j28
-rw-r--r--j2/terraform-record-set.j24
3 files changed, 13 insertions, 6 deletions
diff --git a/j2/terraform-machine-outputs.j2 b/j2/terraform-machine-outputs.j2
new file mode 100644
index 0000000..438fac6
--- /dev/null
+++ b/j2/terraform-machine-outputs.j2
@@ -0,0 +1,7 @@
+output "addresses" {
+ value = {
+{%- for m in machines %}
+ {{ m.key }}: scaleway_instance_ip.{{ m.key }}.address,
+{%- endfor %}
+ }
+}
diff --git a/j2/terraform-machine.j2 b/j2/terraform-machine.j2
index e6f0fe9..889a23d 100644
--- a/j2/terraform-machine.j2
+++ b/j2/terraform-machine.j2
@@ -9,7 +9,7 @@ resource "scaleway_instance_server" "{{ m.key }}" {
resource "scaleway_instance_ip" "{{ m.key }}" {}
-resource "scaleway_instance_ip_reverse_dns" "{{ m.key }}" {
- ip_id = scaleway_instance_ip.{{ m.key }}.id
- reverse = "{{ m.key }}.${google_dns_managed_zone.machine.dns_name}"
-}
+#resource "scaleway_instance_ip_reverse_dns" "{{ m.key }}" {
+# ip_id = scaleway_instance_ip.{{ m.key }}.id
+# reverse = "{{ m.key }}.${google_dns_managed_zone.machine.dns_name}"
+#}
diff --git a/j2/terraform-record-set.j2 b/j2/terraform-record-set.j2
index 7dea150..03304bc 100644
--- a/j2/terraform-record-set.j2
+++ b/j2/terraform-record-set.j2
@@ -1,8 +1,8 @@
-resource "google_dns_record_set" "{{ m.key }}" {
+resource "google_dns_record_set" "{{ m.terraformId }}" {
name = "{{ m.fqdn }}"
managed_zone = "{{ m.terraformManagedZone }}"
type = "{{ m.rrType }}"
ttl = 300
- rrdatas = [{{ m.terraformIp }}]
+ rrdatas = [var.addresses.{{ m.key }}]
}