From 51fb76ffb69bf5e4d1dfa46965fda09c0ba53bc4 Mon Sep 17 00:00:00 2001
From: Paul-Henri Froidmont <git.contact-57n2p@froidmont.org>
Date: Tue, 9 Apr 2019 00:37:28 +0200
Subject: [PATCH] Support multiple environments

---
 host_vars/localhost                           | 11 --------
 inventories/staging/groups                    | 10 -------
 .../{staging => test}/group_vars/all.yml      |  0
 .../group_vars/k8s-cluster.yml                |  2 +-
 .../group_vars/kube-master.yml                |  0
 .../group_vars/kube-node.yml                  |  0
 inventories/test/groups                       | 17 ++++++++++++
 .../{staging => test}/scaleway_inventory.yml  |  7 +++--
 terraform/main.tf                             | 26 ++++++++++++++-----
 9 files changed, 41 insertions(+), 32 deletions(-)
 delete mode 100644 host_vars/localhost
 delete mode 100644 inventories/staging/groups
 rename inventories/{staging => test}/group_vars/all.yml (100%)
 rename inventories/{staging => test}/group_vars/k8s-cluster.yml (73%)
 rename inventories/{staging => test}/group_vars/kube-master.yml (100%)
 rename inventories/{staging => test}/group_vars/kube-node.yml (100%)
 create mode 100644 inventories/test/groups
 rename inventories/{staging => test}/scaleway_inventory.yml (71%)

diff --git a/host_vars/localhost b/host_vars/localhost
deleted file mode 100644
index 1336e9e..0000000
--- a/host_vars/localhost
+++ /dev/null
@@ -1,11 +0,0 @@
----
-harden_linux_sshd_settings_user:
-  "^Port ": "Port 22"
-harden_linux_ufw_rules:
-  - rule: "allow"
-    to_port: "22"
-    protocol: "tcp"
-  - rule: "allow"
-    to_port: "7000"
-    protocol: "udp"
-
diff --git a/inventories/staging/groups b/inventories/staging/groups
deleted file mode 100644
index 12e7be1..0000000
--- a/inventories/staging/groups
+++ /dev/null
@@ -1,10 +0,0 @@
-[kube-master]
-
-[etcd]
-
-[kube-node]
-
-[k8s]
-
-[k8s-cluster:children]
-k8s
diff --git a/inventories/staging/group_vars/all.yml b/inventories/test/group_vars/all.yml
similarity index 100%
rename from inventories/staging/group_vars/all.yml
rename to inventories/test/group_vars/all.yml
diff --git a/inventories/staging/group_vars/k8s-cluster.yml b/inventories/test/group_vars/k8s-cluster.yml
similarity index 73%
rename from inventories/staging/group_vars/k8s-cluster.yml
rename to inventories/test/group_vars/k8s-cluster.yml
index 764b0db..e342efc 100644
--- a/inventories/staging/group_vars/k8s-cluster.yml
+++ b/inventories/test/group_vars/k8s-cluster.yml
@@ -3,4 +3,4 @@ ip: "{{vpn_ip}}"
 kube_network_plugin: flannel
 bin_dir: /usr/local/bin
 cluster_name: banditlair-staging
-dns_domain: k8s.staging.banditlair.com
+dns_domain: staging.k8s.banditlair.com
diff --git a/inventories/staging/group_vars/kube-master.yml b/inventories/test/group_vars/kube-master.yml
similarity index 100%
rename from inventories/staging/group_vars/kube-master.yml
rename to inventories/test/group_vars/kube-master.yml
diff --git a/inventories/staging/group_vars/kube-node.yml b/inventories/test/group_vars/kube-node.yml
similarity index 100%
rename from inventories/staging/group_vars/kube-node.yml
rename to inventories/test/group_vars/kube-node.yml
diff --git a/inventories/test/groups b/inventories/test/groups
new file mode 100644
index 0000000..547aa4c
--- /dev/null
+++ b/inventories/test/groups
@@ -0,0 +1,17 @@
+[test-master]
+[test-etcd]
+[test-node]
+
+[kube-master:children]
+test-master
+
+[etcd:children]
+test-etcd
+
+[kube-node:children]
+test-node
+
+[k8s-cluster:children]
+kube-master
+etcd
+kube-node
diff --git a/inventories/staging/scaleway_inventory.yml b/inventories/test/scaleway_inventory.yml
similarity index 71%
rename from inventories/staging/scaleway_inventory.yml
rename to inventories/test/scaleway_inventory.yml
index c4acf41..57c211f 100644
--- a/inventories/staging/scaleway_inventory.yml
+++ b/inventories/test/scaleway_inventory.yml
@@ -5,9 +5,8 @@ regions:
   - par1
   - ams1
 tags:
-  - k8s
-  - kube-master
-  - etcd
-  - kube-node
+  - test-master
+  - test-etcd
+  - test-node
 variables:
   ansible_host: public_ip.address
diff --git a/terraform/main.tf b/terraform/main.tf
index 12f9548..980fb96 100644
--- a/terraform/main.tf
+++ b/terraform/main.tf
@@ -1,3 +1,18 @@
+locals {
+  environment = "${terraform.workspace != "" ? terraform.workspace : "test"}"
+}
+
+terraform {
+  backend "s3" {
+    bucket     = "banditlair.tfstate"
+    key        = "k8s.tfstate"
+    region     = "nl-ams"
+    endpoint   = "https://s3.nl-ams.scw.cloud"
+    skip_credentials_validation = true
+    skip_region_validation = true
+  }
+}
+
 provider "scaleway" {
   region = "${var.region}"
 }
@@ -7,10 +22,6 @@ data "scaleway_image" "ubuntu" {
   name         = "${var.image}"
 }
 
-//resource "scaleway_ip" "public_ip" {
-//  count = 1
-//}
-
 resource "scaleway_server" "node" {
   count  = "${var.node_instance_count}"
   name   = "node${count.index+1}"
@@ -18,7 +29,7 @@ resource "scaleway_server" "node" {
   type   = "${var.node_instance_type}"
   state  = "running"
   dynamic_ip_required = true,
-  tags   = ["k8s", "kube-node"]
+  tags   = ["${local.environment}-node"]
 }
 
 resource "scaleway_server" "master" {
@@ -28,7 +39,10 @@ resource "scaleway_server" "master" {
   type   = "${var.master_instance_type}"
   state  = "running"
   dynamic_ip_required = true,
-  tags   = ["k8s", "kube-master","etcd"]
+  tags   = [
+    "${local.environment}-master",
+    "${local.environment}-etcd"
+    ]
 }
 
 output "node_private_ips" {