1 files changed, 120 insertions, 50 deletions
diff --git a/out/acme/apps.yaml b/out/acme/apps.yaml
index 95aed6b..d6fbe6d 100644
--- a/out/acme/apps.yaml
+++ b/out/acme/apps.yaml
@@ -49,127 +49,189 @@ type: "io.trygvis.rules.dba.Container"
 data:
   cluster:
     name: "acme-myapp-ci"
-  name: "app"
-  machineRole: "4tune-api"
+  name: "4tune-api"
+  machineRole: "ci-app"
   image: "4tune-api"
   tag: "development"
+  machine:
+    name: "acme-1"
+    fqdn: "acme-1.machine.acme.com"
 ---
 type: "io.trygvis.rules.dba.Container"
 data:
   cluster:
     name: "acme-myapp-production"
-  name: "app"
-  machineRole: "4tune-api"
+  name: "4tune-api"
+  machineRole: "production-app"
   image: "4tune-api"
   tag: "master"
+  machine:
+    name: "acme-3"
+    fqdn: "acme-3.machine.acme.com"
 ---
 type: "io.trygvis.rules.dba.Container"
 data:
   cluster:
     name: "acme-myapp-ci"
-  name: "app"
-  machineRole: "4tune-web"
+  name: "4tune-web"
+  machineRole: "ci-app"
   image: "4tune-web"
   tag: "development"
+  machine:
+    name: "acme-1"
+    fqdn: "acme-1.machine.acme.com"
 ---
 type: "io.trygvis.rules.dba.Container"
 data:
   cluster:
     name: "acme-myapp-production"
-  name: "app"
-  machineRole: "4tune-web"
+  name: "4tune-web"
+  machineRole: "production-app"
   image: "4tune-web"
   tag: "master"
+  machine:
+    name: "acme-3"
+    fqdn: "acme-3.machine.acme.com"
+---
+type: "io.trygvis.rules.dba.Container"
+data:
+  cluster:
+    name: "acme-myapp-ci"
+  name: "mdb"
+  machineRole: "ci-db"
+  image: "mongodb"
+  tag: "3.2"
+  machine:
+    name: "acme-2"
+    fqdn: "acme-2.machine.acme.com"
+---
+type: "io.trygvis.rules.dba.Container"
+data:
+  cluster:
+    name: "acme-myapp-production"
+  name: "mdb"
+  machineRole: "production-db"
+  image: "mongodb"
+  tag: "3.2"
+  machine:
+    name: "acme-3"
+    fqdn: "acme-3.machine.acme.com"
 ---
 type: "io.trygvis.rules.dba.Container"
 data:
   cluster:
     name: "acme-ops"
-  name: "app"
-  machineRole: "n8n"
+  name: "n8n"
+  machineRole: "ops"
   image: "n8n"
   tag: "0.84.1"
+  machine:
+    name: "acme-2"
+    fqdn: "acme-2.machine.acme.com"
+---
+type: "io.trygvis.rules.dba.Container"
+data:
+  cluster:
+    name: "acme-myapp-ci"
+  name: "pdb"
+  machineRole: "ci-db"
+  image: "postgresql"
+  tag: "13"
+  machine:
+    name: "acme-2"
+    fqdn: "acme-2.machine.acme.com"
 ---
 type: "io.trygvis.rules.dba.Container"
 data:
   cluster:
     name: "acme-ops"
-  name: "app"
-  machineRole: "pdb"
+  name: "pdb"
+  machineRole: "ops"
   image: "postgresql"
   tag: "11"
+  machine:
+    name: "acme-2"
+    fqdn: "acme-2.machine.acme.com"
+---
+type: "io.trygvis.rules.dba.Container"
+data:
+  cluster:
+    name: "acme-myapp-production"
+  name: "pdb"
+  machineRole: "production-db"
+  image: "postgresql"
+  tag: "13"
+  machine:
+    name: "acme-3"
+    fqdn: "acme-3.machine.acme.com"
 ---
 type: "io.trygvis.rules.dba.Container"
 data:
   cluster:
     name: "acme-myapp-ci"
-  name: "app"
-  machineRole: "statera"
+  name: "statera"
+  machineRole: "ci-app"
   image: "statera"
   tag: "development"
+  machine:
+    name: "acme-1"
+    fqdn: "acme-1.machine.acme.com"
 ---
 type: "io.trygvis.rules.dba.Container"
 data:
   cluster:
     name: "acme-myapp-production"
-  name: "app"
-  machineRole: "statera"
+  name: "statera"
+  machineRole: "production-app"
   image: "statera"
   tag: "master"
+  machine:
+    name: "acme-3"
+    fqdn: "acme-3.machine.acme.com"
 ---
 type: "io.trygvis.rules.dba.Container"
 data:
   cluster:
     name: "acme-myapp-ci"
-  name: "app"
-  machineRole: "statera-console"
+  name: "statera-console"
+  machineRole: "ci-app"
   image: "statera-console"
   tag: "development"
+  machine:
+    name: "acme-1"
+    fqdn: "acme-1.machine.acme.com"
 ---
 type: "io.trygvis.rules.dba.Container"
 data:
   cluster:
     name: "acme-myapp-production"
-  name: "app"
-  machineRole: "statera-console"
+  name: "statera-console"
+  machineRole: "production-app"
   image: "statera-console"
   tag: "master"
+  machine:
+    name: "acme-3"
+    fqdn: "acme-3.machine.acme.com"
 ---
-type: "io.trygvis.rules.dba.Container"
-data:
-  cluster:
-    name: "acme-myapp-production"
-  name: "db"
-  machineRole: "mdb"
-  image: "mongodb"
-  tag: "3.2"
----
-type: "io.trygvis.rules.dba.Container"
+type: "io.trygvis.rules.dba.DbaMachineRole"
 data:
-  cluster:
-    name: "acme-myapp-ci"
-  name: "db"
-  machineRole: "mdb"
-  image: "mongodb"
-  tag: "3.2"
+  machine: "acme-1"
+  roles:
+  - "ci-app"
 ---
-type: "io.trygvis.rules.dba.Container"
+type: "io.trygvis.rules.dba.DbaMachineRole"
 data:
-  cluster:
-    name: "acme-myapp-production"
-  name: "db"
-  machineRole: "pdb"
-  image: "postgresql"
-  tag: "13"
+  machine: "acme-2"
+  roles:
+  - "ops"
+  - "ci-db"
 ---
-type: "io.trygvis.rules.dba.Container"
+type: "io.trygvis.rules.dba.DbaMachineRole"
 data:
-  cluster:
-    name: "acme-myapp-ci"
-  name: "db"
-  machineRole: "pdb"
-  image: "postgresql"
-  tag: "13"
+  machine: "acme-3"
+  roles:
+  - "production-app"
+  - "production-db"
 ---
 type: "io.trygvis.rules.dns.DnsEntry"
 data:
@@ -210,6 +272,14 @@ data:
   key: "acme-3"
   expression: "scaleway_instance_ip.acme-3.address"
 ---
+type: "io.trygvis.rules.dns.DnsZone"
+data:
+  name: "ci.acme.com"
+---
+type: "io.trygvis.rules.dns.DnsZone"
+data:
+  name: "production.acme.com"
+---
 type: "io.trygvis.rules.engine.KeyValue"
 data:
   key: "rm-gen"