From 9e353ef7af8164d33544a890e60d2049de7d61cb Mon Sep 17 00:00:00 2001 From: Trygve Laugstøl Date: Tue, 5 Jan 2021 19:48:04 +0100 Subject: Better sorting. --- out/phase-1.yaml | 93 ++++++++++++++++++++++++-------------------------------- 1 file changed, 39 insertions(+), 54 deletions(-) (limited to 'out/phase-1.yaml') diff --git a/out/phase-1.yaml b/out/phase-1.yaml index 7347ca8..0ec42e0 100644 --- a/out/phase-1.yaml +++ b/out/phase-1.yaml @@ -11,40 +11,25 @@ data: --- type: "io.trygvis.rules.acme.AcmeServer" data: - machine: - name: "acme-2" - fqdn: "acme-2.machine.acme.com" ---- -type: "io.trygvis.rules.acme.AcmeServer" -data: + name: "acme-1" machine: name: "acme-1" fqdn: "acme-1.machine.acme.com" --- type: "io.trygvis.rules.acme.AcmeServer" data: - machine: - name: "acme-3" - fqdn: "acme-3.machine.acme.com" ---- -type: "io.trygvis.rules.acme.AcmeServer" -data: + name: "acme-2" machine: name: "acme-2" fqdn: "acme-2.machine.acme.com" --- type: "io.trygvis.rules.acme.AcmeServer" data: + name: "acme-3" machine: name: "acme-3" fqdn: "acme-3.machine.acme.com" --- -type: "io.trygvis.rules.acme.AcmeServer" -data: - machine: - name: "acme-1" - fqdn: "acme-1.machine.acme.com" ---- type: "io.trygvis.rules.acme.WgHost" data: name: "acme-1" @@ -101,19 +86,19 @@ data: type: "io.trygvis.rules.dba.Container" data: cluster: - name: "acme-production" + name: "acme-ci" name: "app" machineRole: "4tune-api" image: "4tune-api" - tag: "master" + tag: "development" --- type: "io.trygvis.rules.dba.Container" data: cluster: name: "acme-production" name: "app" - machineRole: "4tune-web" - image: "4tune-web" + machineRole: "4tune-api" + image: "4tune-api" tag: "master" --- type: "io.trygvis.rules.dba.Container" @@ -126,21 +111,12 @@ data: tag: "development" --- type: "io.trygvis.rules.dba.Container" -data: - cluster: - name: "acme-ci" - name: "app" - machineRole: "statera-console" - image: "statera-console" - tag: "development" ---- -type: "io.trygvis.rules.dba.Container" data: cluster: name: "acme-production" name: "app" - machineRole: "statera-console" - image: "statera-console" + machineRole: "4tune-web" + image: "4tune-web" tag: "master" --- type: "io.trygvis.rules.dba.Container" @@ -148,17 +124,26 @@ data: cluster: name: "acme-ci" name: "app" - machineRole: "4tune-api" - image: "4tune-api" + machineRole: "statera" + image: "statera" tag: "development" --- type: "io.trygvis.rules.dba.Container" data: cluster: - name: "acme-ci" + name: "acme-production" name: "app" machineRole: "statera" image: "statera" + tag: "master" +--- +type: "io.trygvis.rules.dba.Container" +data: + cluster: + name: "acme-ci" + name: "app" + machineRole: "statera-console" + image: "statera-console" tag: "development" --- type: "io.trygvis.rules.dba.Container" @@ -166,18 +151,18 @@ data: cluster: name: "acme-production" name: "app" - machineRole: "statera" - image: "statera" + machineRole: "statera-console" + image: "statera-console" tag: "master" --- type: "io.trygvis.rules.dba.Container" data: cluster: - name: "acme-production" + name: "acme-ci" name: "db" - machineRole: "pdb" - image: "postgresql" - tag: "13" + machineRole: "mdb" + image: "mongodb" + tag: "3.2" --- type: "io.trygvis.rules.dba.Container" data: @@ -193,14 +178,14 @@ data: cluster: name: "acme-ci" name: "db" - machineRole: "mdb" - image: "mongodb" - tag: "3.2" + machineRole: "pdb" + image: "postgresql" + tag: "13" --- type: "io.trygvis.rules.dba.Container" data: cluster: - name: "acme-ci" + name: "acme-production" name: "db" machineRole: "pdb" image: "postgresql" @@ -208,42 +193,42 @@ data: --- type: "io.trygvis.rules.dns.DnsEntry" data: - fqdn: "ws-1.vpn.acme.com" + fqdn: "acme-1.machine.acme.com" type: "A" --- type: "io.trygvis.rules.dns.DnsEntry" data: - fqdn: "acme-2.machine.acme.com" + fqdn: "acme-1.vpn.acme.com" type: "A" --- type: "io.trygvis.rules.dns.DnsEntry" data: - fqdn: "ws-2.vpn.acme.com" + fqdn: "acme-2.machine.acme.com" type: "A" --- type: "io.trygvis.rules.dns.DnsEntry" data: - fqdn: "acme-3.machine.acme.com" + fqdn: "acme-2.vpn.acme.com" type: "A" --- type: "io.trygvis.rules.dns.DnsEntry" data: - fqdn: "acme-1.vpn.acme.com" + fqdn: "acme-3.machine.acme.com" type: "A" --- type: "io.trygvis.rules.dns.DnsEntry" data: - fqdn: "acme-2.vpn.acme.com" + fqdn: "acme-3.vpn.acme.com" type: "A" --- type: "io.trygvis.rules.dns.DnsEntry" data: - fqdn: "acme-1.machine.acme.com" + fqdn: "ws-1.vpn.acme.com" type: "A" --- type: "io.trygvis.rules.dns.DnsEntry" data: - fqdn: "acme-3.vpn.acme.com" + fqdn: "ws-2.vpn.acme.com" type: "A" --- type: "io.trygvis.rules.dns.DnsEntryTerraformExpression" -- cgit v1.2.3