Support multiple environments

host_vars/localhost

@@ -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"
-

inventories/staging/groups

@@ -1,10 +0,0 @@
-[kube-master]
-
-[etcd]
-
-[kube-node]
-
-[k8s]
-
-[k8s-cluster:children]
-k8s

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

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

inventories/test/scaleway_inventory.yml

@@ -5,9 +5,8 @@ regions:
   - par1
   - ams1
 tags:
-  - k8s
+  - test-master
-  - kube-master
+  - test-etcd
-  - etcd
+  - test-node
-  - kube-node
 variables:
   ansible_host: public_ip.address

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" {