From 9851dffc8d915ff01117a5ed8070e5b2a1ef2bb5 Mon Sep 17 00:00:00 2001
From: Trygve Laugstøl <trygvis@inamo.no>
Date: Mon, 28 Dec 2020 21:56:05 +0100
Subject: Better structure.

Splitting machines and terraform machines, ditto with dns.
---
 gen/platform/ansible/acme-1.tf   |  1 -
 gen/platform/ansible/acme-1.yml  |  6 ++++++
 gen/platform/ansible/acme-2.tf   |  1 -
 gen/platform/ansible/acme-2.yml  |  6 ++++++
 gen/platform/ansible/acme-3.tf   |  1 -
 gen/platform/ansible/acme-3.yml  |  6 ++++++
 gen/platform/terraform/acme-1.tf | 11 -----------
 gen/platform/terraform/acme-2.tf | 11 -----------
 gen/platform/terraform/acme-3.tf | 11 -----------
 gen/platform/terraform/main.tf   |  7 +++++++
 10 files changed, 25 insertions(+), 36 deletions(-)
 delete mode 100644 gen/platform/ansible/acme-1.tf
 create mode 100644 gen/platform/ansible/acme-1.yml
 delete mode 100644 gen/platform/ansible/acme-2.tf
 create mode 100644 gen/platform/ansible/acme-2.yml
 delete mode 100644 gen/platform/ansible/acme-3.tf
 create mode 100644 gen/platform/ansible/acme-3.yml
 create mode 100644 gen/platform/terraform/main.tf

(limited to 'gen/platform')

diff --git a/gen/platform/ansible/acme-1.tf b/gen/platform/ansible/acme-1.tf
deleted file mode 100644
index 686275d..0000000
--- a/gen/platform/ansible/acme-1.tf
+++ /dev/null
@@ -1 +0,0 @@
-# Ansible
diff --git a/gen/platform/ansible/acme-1.yml b/gen/platform/ansible/acme-1.yml
new file mode 100644
index 0000000..f5849b2
--- /dev/null
+++ b/gen/platform/ansible/acme-1.yml
@@ -0,0 +1,6 @@
+# Ansible
+- hosts:
+    - acme-1
+  tasks:
+    - import_role:
+        name: acme-platform
diff --git a/gen/platform/ansible/acme-2.tf b/gen/platform/ansible/acme-2.tf
deleted file mode 100644
index 686275d..0000000
--- a/gen/platform/ansible/acme-2.tf
+++ /dev/null
@@ -1 +0,0 @@
-# Ansible
diff --git a/gen/platform/ansible/acme-2.yml b/gen/platform/ansible/acme-2.yml
new file mode 100644
index 0000000..755c214
--- /dev/null
+++ b/gen/platform/ansible/acme-2.yml
@@ -0,0 +1,6 @@
+# Ansible
+- hosts:
+    - acme-2
+  tasks:
+    - import_role:
+        name: acme-platform
diff --git a/gen/platform/ansible/acme-3.tf b/gen/platform/ansible/acme-3.tf
deleted file mode 100644
index 686275d..0000000
--- a/gen/platform/ansible/acme-3.tf
+++ /dev/null
@@ -1 +0,0 @@
-# Ansible
diff --git a/gen/platform/ansible/acme-3.yml b/gen/platform/ansible/acme-3.yml
new file mode 100644
index 0000000..880a21f
--- /dev/null
+++ b/gen/platform/ansible/acme-3.yml
@@ -0,0 +1,6 @@
+# Ansible
+- hosts:
+    - acme-3
+  tasks:
+    - import_role:
+        name: acme-platform
diff --git a/gen/platform/terraform/acme-1.tf b/gen/platform/terraform/acme-1.tf
index d488fbc..06b681f 100644
--- a/gen/platform/terraform/acme-1.tf
+++ b/gen/platform/terraform/acme-1.tf
@@ -13,14 +13,3 @@ resource "scaleway_instance_ip_reverse_dns" "acme-1" {
   ip_id   = scaleway_instance_ip.acme-1.id
   reverse = "acme-1.${google_dns_managed_zone.machine.dns_name}"
 }
-
-resource "google_dns_record_set" "acme-1" {
-  name         = "acme-1.${google_dns_managed_zone.machine.dns_name}"
-  managed_zone = google_dns_managed_zone.machine.name
-  type         = "A"
-  ttl          = 300
-
-  rrdatas      = [scaleway_instance_ip.acme-1.public_ip]
-
-  depends_on   = [google_dns_managed_zone.ci]
-}
diff --git a/gen/platform/terraform/acme-2.tf b/gen/platform/terraform/acme-2.tf
index e791c61..d2e41b0 100644
--- a/gen/platform/terraform/acme-2.tf
+++ b/gen/platform/terraform/acme-2.tf
@@ -13,14 +13,3 @@ resource "scaleway_instance_ip_reverse_dns" "acme-2" {
   ip_id   = scaleway_instance_ip.acme-2.id
   reverse = "acme-2.${google_dns_managed_zone.machine.dns_name}"
 }
-
-resource "google_dns_record_set" "acme-2" {
-  name         = "acme-2.${google_dns_managed_zone.machine.dns_name}"
-  managed_zone = google_dns_managed_zone.machine.name
-  type         = "A"
-  ttl          = 300
-
-  rrdatas      = [scaleway_instance_ip.acme-2.public_ip]
-
-  depends_on   = [google_dns_managed_zone.ci]
-}
diff --git a/gen/platform/terraform/acme-3.tf b/gen/platform/terraform/acme-3.tf
index 13977bd..4a84d3f 100644
--- a/gen/platform/terraform/acme-3.tf
+++ b/gen/platform/terraform/acme-3.tf
@@ -13,14 +13,3 @@ resource "scaleway_instance_ip_reverse_dns" "acme-3" {
   ip_id   = scaleway_instance_ip.acme-3.id
   reverse = "acme-3.${google_dns_managed_zone.machine.dns_name}"
 }
-
-resource "google_dns_record_set" "acme-3" {
-  name         = "acme-3.${google_dns_managed_zone.machine.dns_name}"
-  managed_zone = google_dns_managed_zone.machine.name
-  type         = "A"
-  ttl          = 300
-
-  rrdatas      = [scaleway_instance_ip.acme-3.public_ip]
-
-  depends_on   = [google_dns_managed_zone.ci]
-}
diff --git a/gen/platform/terraform/main.tf b/gen/platform/terraform/main.tf
new file mode 100644
index 0000000..3f217ed
--- /dev/null
+++ b/gen/platform/terraform/main.tf
@@ -0,0 +1,7 @@
+terraform {
+  required_providers {
+    scaleway = {
+      source = "scaleway/scaleway"
+    }
+  }
+}
-- 
cgit v1.2.3