diff options
| -rw-r--r-- | acme-apps/ansible/dba/acme-myapp-ci.yml | 28 | ||||
| -rw-r--r-- | acme-apps/ansible/dba/acme-myapp-production.yml | 2 | ||||
| -rw-r--r-- | acme-apps/ansible/dba/acme-ops.yml | 2 | ||||
| -rw-r--r-- | j2/dba/cluster.j2 | 2 |
4 files changed, 17 insertions, 17 deletions
diff --git a/acme-apps/ansible/dba/acme-myapp-ci.yml b/acme-apps/ansible/dba/acme-myapp-ci.yml index e44b73e..584ddf3 100644 --- a/acme-apps/ansible/dba/acme-myapp-ci.yml +++ b/acme-apps/ansible/dba/acme-myapp-ci.yml @@ -3,7 +3,7 @@ # cluster: --- - host: - - io.trygvis.rules.machine.Machine@b112b13 + - acme-1 tasks: import_role: name: docker-service @@ -11,14 +11,18 @@ template: | version: "3" services: - mdb: - image: mongodb:3.2 - pdb: - image: postgresql:13 + 4tune-api: + image: 4tune-api:development + 4tune-web: + image: 4tune-web:development + statera-console: + image: statera-console:development + statera: + image: statera:development --- - host: - - io.trygvis.rules.machine.Machine@d5556bf + - acme-2 tasks: import_role: name: docker-service @@ -26,12 +30,8 @@ template: | version: "3" services: - 4tune-api: - image: 4tune-api:development - 4tune-web: - image: 4tune-web:development - statera-console: - image: statera-console:development - statera: - image: statera:development + mdb: + image: mongodb:3.2 + pdb: + image: postgresql:13 diff --git a/acme-apps/ansible/dba/acme-myapp-production.yml b/acme-apps/ansible/dba/acme-myapp-production.yml index 3cd0798..6b6bf6c 100644 --- a/acme-apps/ansible/dba/acme-myapp-production.yml +++ b/acme-apps/ansible/dba/acme-myapp-production.yml @@ -3,7 +3,7 @@ # cluster: --- - host: - - io.trygvis.rules.machine.Machine@3ac3f6f + - acme-3 tasks: import_role: name: docker-service diff --git a/acme-apps/ansible/dba/acme-ops.yml b/acme-apps/ansible/dba/acme-ops.yml index 62264b0..077c554 100644 --- a/acme-apps/ansible/dba/acme-ops.yml +++ b/acme-apps/ansible/dba/acme-ops.yml @@ -3,7 +3,7 @@ # cluster: --- - host: - - io.trygvis.rules.machine.Machine@b112b13 + - acme-2 tasks: import_role: name: docker-service diff --git a/j2/dba/cluster.j2 b/j2/dba/cluster.j2 index 87973ff..045fbcd 100644 --- a/j2/dba/cluster.j2 +++ b/j2/dba/cluster.j2 @@ -4,7 +4,7 @@ {%- for m, containers in containersByMachine.entrySet() %} --- - host: - - {{ m }} + - {{ m.name }} tasks: import_role: name: docker-service |