16 files changed, 60 insertions, 111 deletions
diff --git a/acme-apps/ansible/dba/acme-myapp-ci.yml b/acme-apps/ansible/dba/acme-myapp-ci.yml
index e73360d..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:
-    - acme-2
+    - 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:
-    - acme-1
+    - 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/terraform/acme-1-instance.tf b/acme-apps/terraform/acme-1-instance.tf
new file mode 100644
index 0000000..e1aed14
--- /dev/null
+++ b/acme-apps/terraform/acme-1-instance.tf
@@ -0,0 +1,8 @@
+resource "scaleway_server_instance" "acme-1" {
+  name = "acme-1"
+  type = "DEV1-S"
+  image = "b3042271-d2b1-4f87-b407-aedd3bbd1663"
+  ip_id = scaleway_instance_ip.acme-1.ip
+  enable_dynamic_ip = false
+  enable_ipv6 = true
+}
diff --git a/acme-apps/terraform/acme-1-ip.tf b/acme-apps/terraform/acme-1-ip.tf
new file mode 100644
index 0000000..283eb55
--- /dev/null
+++ b/acme-apps/terraform/acme-1-ip.tf
@@ -0,0 +1,4 @@
+resource "scaleway_instance_reverse_dns" "acme-1" {
+  reverse = "acme-1.machine.acme.com."
+  ip_id = scaleway_instance_ip.acme-1.id
+}
diff --git a/acme-apps/terraform/acme-2-instance.tf b/acme-apps/terraform/acme-2-instance.tf
new file mode 100644
index 0000000..4ae0fe5
--- /dev/null
+++ b/acme-apps/terraform/acme-2-instance.tf
@@ -0,0 +1,8 @@
+resource "scaleway_server_instance" "acme-2" {
+  name = "acme-1"
+  type = "DEV1-S"
+  image = "b3042271-d2b1-4f87-b407-aedd3bbd1663"
+  ip_id = scaleway_instance_ip.acme-2.ip
+  enable_dynamic_ip = false
+  enable_ipv6 = true
+}
diff --git a/acme-apps/terraform/acme-2-ip.tf b/acme-apps/terraform/acme-2-ip.tf
new file mode 100644
index 0000000..f72fe88
--- /dev/null
+++ b/acme-apps/terraform/acme-2-ip.tf
@@ -0,0 +1,4 @@
+resource "scaleway_instance_reverse_dns" "acme-2" {
+  reverse = "acme-2.machine.acme.com."
+  ip_id = scaleway_instance_ip.acme-2.id
+}
diff --git a/acme-apps/terraform/acme-3-instance.tf b/acme-apps/terraform/acme-3-instance.tf
new file mode 100644
index 0000000..389b39b
--- /dev/null
+++ b/acme-apps/terraform/acme-3-instance.tf
@@ -0,0 +1,8 @@
+resource "scaleway_server_instance" "acme-3" {
+  name = "acme-1"
+  type = "DEV1-S"
+  image = "b3042271-d2b1-4f87-b407-aedd3bbd1663"
+  ip_id = scaleway_instance_ip.acme-3.ip
+  enable_dynamic_ip = false
+  enable_ipv6 = true
+}
diff --git a/acme-apps/terraform/acme-3-ip.tf b/acme-apps/terraform/acme-3-ip.tf
new file mode 100644
index 0000000..7d07eb9
--- /dev/null
+++ b/acme-apps/terraform/acme-3-ip.tf
@@ -0,0 +1,4 @@
+resource "scaleway_instance_reverse_dns" "acme-3" {
+  reverse = "acme-3.machine.acme.com."
+  ip_id = scaleway_instance_ip.acme-3.id
+}
diff --git a/acme-apps/terraform/dns-acme-1.tf b/acme-apps/terraform/dns-acme-1.tf
deleted file mode 100644
index bc8c127..0000000
--- a/acme-apps/terraform/dns-acme-1.tf
+++ /dev/null
@@ -1,8 +0,0 @@
-resource "google_dns_record_set" "acme-1" {
-  name         = "acme-1.machine.acme.com"
-  managed_zone = var.acme_zone
-  type         = "A"
-  ttl          = 300
-
-  rrdatas      = [scaleway_instance_ip.acme-1.address]
-}
diff --git a/acme-apps/terraform/dns-acme-2.tf b/acme-apps/terraform/dns-acme-2.tf
deleted file mode 100644
index 5fb616f..0000000
--- a/acme-apps/terraform/dns-acme-2.tf
+++ /dev/null
@@ -1,8 +0,0 @@
-resource "google_dns_record_set" "acme-2" {
-  name         = "acme-2.machine.acme.com"
-  managed_zone = var.acme_zone
-  type         = "A"
-  ttl          = 300
-
-  rrdatas      = [scaleway_instance_ip.acme-2.address]
-}
diff --git a/acme-apps/terraform/dns-acme-3.tf b/acme-apps/terraform/dns-acme-3.tf
deleted file mode 100644
index 539ba44..0000000
--- a/acme-apps/terraform/dns-acme-3.tf
+++ /dev/null
@@ -1,8 +0,0 @@
-resource "google_dns_record_set" "acme-3" {
-  name         = "acme-3.machine.acme.com"
-  managed_zone = var.acme_zone
-  type         = "A"
-  ttl          = 300
-
-  rrdatas      = [scaleway_instance_ip.acme-3.address]
-}
diff --git a/acme-apps/terraform/main-scaleway-machine.tf b/acme-apps/terraform/main-scaleway-machine.tf
deleted file mode 100644
index ef74c6e..0000000
--- a/acme-apps/terraform/main-scaleway-machine.tf
+++ /dev/null
@@ -1,16 +0,0 @@
-# Generated
-
-terraform {
-  required_providers {
-    scaleway = {
-      source = "scaleway/scaleway"
-      version = "1.17.2"
-    }
-  }
-}
-
-provider "scaleway" {
-}
-variable "acme_zone" {
-  type = string
-}
diff --git a/acme-apps/terraform/main.tf b/acme-apps/terraform/main.tf
new file mode 100644
index 0000000..74efe05
--- /dev/null
+++ b/acme-apps/terraform/main.tf
@@ -0,0 +1,9 @@
+terraform {
+  required_providers {
+
+    scaleway = {
+      version = "2.0.0-rc1"
+      source = "scaleway"
+    }
+  }
+}
diff --git a/acme-apps/terraform/scaleway-machine-acme-1.tf b/acme-apps/terraform/scaleway-machine-acme-1.tf
deleted file mode 100644
index 46fc0dd..0000000
--- a/acme-apps/terraform/scaleway-machine-acme-1.tf
+++ /dev/null
@@ -1,19 +0,0 @@
-resource "scaleway_instance_server" "acme-1" {
-  name = "acme-1"
-  type = "DEV1-S"
-  image = "b3042271-d2b1-4f87-b407-aedd3bbd1663"
-  ip_id = scaleway_instance_ip.acme-1.id
-  enable_dynamic_ip = false
-  enable_ipv6 = true
-}
-
-resource "scaleway_instance_ip" "acme-1" {}
-
-resource "scaleway_instance_ip_reverse_dns" "acme-1" {
-  ip_id   = scaleway_instance_ip.acme-1.id
-  reverse = "acme-1.machine.acme.com."
-}
-
-output "acme-1_public_ip" {
-  value = scaleway_instance_server.acme-1.public_ip
-}
diff --git a/acme-apps/terraform/scaleway-machine-acme-2.tf b/acme-apps/terraform/scaleway-machine-acme-2.tf
deleted file mode 100644
index aa9387e..0000000
--- a/acme-apps/terraform/scaleway-machine-acme-2.tf
+++ /dev/null
@@ -1,19 +0,0 @@
-resource "scaleway_instance_server" "acme-2" {
-  name = "acme-1"
-  type = "DEV1-S"
-  image = "b3042271-d2b1-4f87-b407-aedd3bbd1663"
-  ip_id = scaleway_instance_ip.acme-2.id
-  enable_dynamic_ip = false
-  enable_ipv6 = true
-}
-
-resource "scaleway_instance_ip" "acme-2" {}
-
-resource "scaleway_instance_ip_reverse_dns" "acme-2" {
-  ip_id   = scaleway_instance_ip.acme-2.id
-  reverse = "acme-2.machine.acme.com."
-}
-
-output "acme-2_public_ip" {
-  value = scaleway_instance_server.acme-2.public_ip
-}
diff --git a/acme-apps/terraform/scaleway-machine-acme-3.tf b/acme-apps/terraform/scaleway-machine-acme-3.tf
deleted file mode 100644
index 61971ab..0000000
--- a/acme-apps/terraform/scaleway-machine-acme-3.tf
+++ /dev/null
@@ -1,19 +0,0 @@
-resource "scaleway_instance_server" "acme-3" {
-  name = "acme-1"
-  type = "DEV1-S"
-  image = "b3042271-d2b1-4f87-b407-aedd3bbd1663"
-  ip_id = scaleway_instance_ip.acme-3.id
-  enable_dynamic_ip = false
-  enable_ipv6 = true
-}
-
-resource "scaleway_instance_ip" "acme-3" {}
-
-resource "scaleway_instance_ip_reverse_dns" "acme-3" {
-  ip_id   = scaleway_instance_ip.acme-3.id
-  reverse = "acme-3.machine.acme.com."
-}
-
-output "acme-3_public_ip" {
-  value = scaleway_instance_server.acme-3.public_ip
-}
diff --git a/acme-apps/terraform/vars.tf b/acme-apps/terraform/vars.tf
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/acme-apps/terraform/vars.tf
@@ -0,0 +1 @@
+