From bafe762ac01d16904c18404283027e426e19bc73 Mon Sep 17 00:00:00 2001
From: Trygve Laugstøl <trygvis@inamo.no>
Date: Wed, 3 Feb 2021 16:35:48 +0100
Subject: Code reorganization.

Moving main code to src, keeping modules in modules/
---
 .../src/main/resources/templates/dba/cluster.j2       | 19 -------------------
 .../src/main/resources/templates/platform-ansible.j2  |  6 ------
 .../resources/templates/terraform/machine-outputs.j2  |  7 -------
 .../src/main/resources/templates/terraform/machine.j2 | 19 -------------------
 .../templates/terraform/main-scaleway-machine.j2      | 19 -------------------
 .../src/main/resources/templates/terraform/main.j2    | 10 ----------
 .../main/resources/templates/terraform/record-set.j2  |  8 --------
 .../main/resources/templates/terraform/resource.j2    |  1 -
 .../main/resources/templates/terraform/variables.j2   | 10 ----------
 9 files changed, 99 deletions(-)
 delete mode 100644 module/ri-base/src/main/resources/templates/dba/cluster.j2
 delete mode 100644 module/ri-base/src/main/resources/templates/platform-ansible.j2
 delete mode 100644 module/ri-base/src/main/resources/templates/terraform/machine-outputs.j2
 delete mode 100644 module/ri-base/src/main/resources/templates/terraform/machine.j2
 delete mode 100644 module/ri-base/src/main/resources/templates/terraform/main-scaleway-machine.j2
 delete mode 100644 module/ri-base/src/main/resources/templates/terraform/main.j2
 delete mode 100644 module/ri-base/src/main/resources/templates/terraform/record-set.j2
 delete mode 100644 module/ri-base/src/main/resources/templates/terraform/resource.j2
 delete mode 100644 module/ri-base/src/main/resources/templates/terraform/variables.j2

(limited to 'module/ri-base/src/main/resources/templates')

diff --git a/module/ri-base/src/main/resources/templates/dba/cluster.j2 b/module/ri-base/src/main/resources/templates/dba/cluster.j2
deleted file mode 100644
index 045fbcd..0000000
--- a/module/ri-base/src/main/resources/templates/dba/cluster.j2
+++ /dev/null
@@ -1,19 +0,0 @@
-# Generated
-
-# cluster: {{ cluster.name }}
-{%- for m, containers in containersByMachine.entrySet() %}
----
-- host:
-    - {{ m.name }}
-  tasks:
-    import_role:
-      name: docker-service
-      vars:
-        template: |
-          version: "3"
-          services:
-{%- for c in containers %}
-            {{ c.name }}:
-              image: {{ c.image }}:{{ c.tag }}
-{%- endfor %}
-{% endfor %}
diff --git a/module/ri-base/src/main/resources/templates/platform-ansible.j2 b/module/ri-base/src/main/resources/templates/platform-ansible.j2
deleted file mode 100644
index 72e3247..0000000
--- a/module/ri-base/src/main/resources/templates/platform-ansible.j2
+++ /dev/null
@@ -1,6 +0,0 @@
-# Ansible
-- hosts:
-    - {{ m.key }}
-  tasks:
-    - import_role:
-        name: acme-platform
diff --git a/module/ri-base/src/main/resources/templates/terraform/machine-outputs.j2 b/module/ri-base/src/main/resources/templates/terraform/machine-outputs.j2
deleted file mode 100644
index 438fac6..0000000
--- a/module/ri-base/src/main/resources/templates/terraform/machine-outputs.j2
+++ /dev/null
@@ -1,7 +0,0 @@
-output "addresses" {
-  value = {
-{%- for m in machines %}
-    {{ m.key }}: scaleway_instance_ip.{{ m.key }}.address,
-{%- endfor %}
-  }
-}
diff --git a/module/ri-base/src/main/resources/templates/terraform/machine.j2 b/module/ri-base/src/main/resources/templates/terraform/machine.j2
deleted file mode 100644
index 0ac8b90..0000000
--- a/module/ri-base/src/main/resources/templates/terraform/machine.j2
+++ /dev/null
@@ -1,19 +0,0 @@
-resource "scaleway_instance_server" "{{ scw.key }}" {
-  name = "acme-1"
-  type = "DEV1-S"
-  image = "b3042271-d2b1-4f87-b407-aedd3bbd1663"
-  ip_id = scaleway_instance_ip.{{ scw.key }}.id
-  enable_dynamic_ip = false
-  enable_ipv6 = true
-}
-
-resource "scaleway_instance_ip" "{{ scw.key }}" {}
-
-resource "scaleway_instance_ip_reverse_dns" "{{ scw.key }}" {
-  ip_id   = scaleway_instance_ip.{{ scw.key }}.id
-  reverse = "{{ m.fqdn }}."
-}
-
-output "{{scw.key}}_public_ip" {
-  value = scaleway_instance_server.{{ scw.key }}.public_ip
-}
diff --git a/module/ri-base/src/main/resources/templates/terraform/main-scaleway-machine.j2 b/module/ri-base/src/main/resources/templates/terraform/main-scaleway-machine.j2
deleted file mode 100644
index eab9fac..0000000
--- a/module/ri-base/src/main/resources/templates/terraform/main-scaleway-machine.j2
+++ /dev/null
@@ -1,19 +0,0 @@
-# Generated
-
-terraform {
-  required_providers {
-    scaleway = {
-      source = "scaleway/scaleway"
-      version = "1.17.2"
-    }
-  }
-}
-
-provider "scaleway" {
-}
-
-{% -for z in managedZones %}
-variable "{{z.name}}" {
-  type = string
-}
-{% endfor -%}
diff --git a/module/ri-base/src/main/resources/templates/terraform/main.j2 b/module/ri-base/src/main/resources/templates/terraform/main.j2
deleted file mode 100644
index 009f4ed..0000000
--- a/module/ri-base/src/main/resources/templates/terraform/main.j2
+++ /dev/null
@@ -1,10 +0,0 @@
-terraform {
-  required_providers {
-{% for alias, provider in main.providers.entrySet() %}
-    {{ alias }} = {
-      version = "{{ provider.version }}"
-      source = "{{ provider.source }}"
-    }
-{%- endfor %}
-  }
-}
diff --git a/module/ri-base/src/main/resources/templates/terraform/record-set.j2 b/module/ri-base/src/main/resources/templates/terraform/record-set.j2
deleted file mode 100644
index b89ee00..0000000
--- a/module/ri-base/src/main/resources/templates/terraform/record-set.j2
+++ /dev/null
@@ -1,8 +0,0 @@
-resource "google_dns_record_set" "{{ tf.key }}" {
-  name         = "{{ entry.fqdn }}"
-  managed_zone = var.{{ managedZone.name }}
-  type         = "{{ entry.type }}"
-  ttl          = 300
-
-  rrdatas      = [{{ tf.expression }}]
-}
diff --git a/module/ri-base/src/main/resources/templates/terraform/resource.j2 b/module/ri-base/src/main/resources/templates/terraform/resource.j2
deleted file mode 100644
index 91af481..0000000
--- a/module/ri-base/src/main/resources/templates/terraform/resource.j2
+++ /dev/null
@@ -1 +0,0 @@
-{{ resource.asString() -}}
diff --git a/module/ri-base/src/main/resources/templates/terraform/variables.j2 b/module/ri-base/src/main/resources/templates/terraform/variables.j2
deleted file mode 100644
index 6c37d99..0000000
--- a/module/ri-base/src/main/resources/templates/terraform/variables.j2
+++ /dev/null
@@ -1,10 +0,0 @@
-{%- for var in variables %}
-variable "{{ var.name }}" {
-{%- if var.type %}
-  type = {{ var.type }}
-{% endif %}
-{%- if var.default %}
-  default = {{ var.default }}
-{% endif %}
-}
-{% endfor %}
-- 
cgit v1.2.3