Rename hosts

10 files changed, 99 insertions, 62 deletions

diff --git a/group_vars/all.yml b/group_vars/all.yml
index a8a4543..3de17c9 100644
--- a/group_vars/all.yml
+++ b/group_vars/all.yml
@@ -11,7 +11,7 @@ path_prometheusconfig: "/etc/prometheus/prometheus.yml"
 
 global:
 
-  dcontroller: "dcontroller"
+  dcontroller: "dc0"
   domain_name: "rgoncalves.se"
 
   dns:
diff --git a/host_vars/dcontroller.yml b/host_vars/dc0.yml
index 2194216..a54d009 100644
--- a/host_vars/dcontroller.yml
+++ b/host_vars/dc0.yml
@@ -1,4 +1,4 @@
-ansible_host: dcontroller
+ansible_host: dc0
 virtual: true
 
 ip:
diff --git a/host_vars/vm1.yml b/host_vars/st0cld0.yml
index c213f8b..c668e4d 100644
--- a/host_vars/vm1.yml
+++ b/host_vars/st0cld0.yml
@@ -1,4 +1,4 @@
-ansible_host: vm1
+ansible_host: st0cld0
 ip:
   in: 10.10.0.61
   out: 192.168.5.61
@@ -11,3 +11,6 @@ services:
     proto: "tcp"
     port: "22"
 
+  - name: "grafana"
+    proto: "tcp"
+    port: "3000"
diff --git a/host_vars/vm2.yml b/host_vars/st0dev0.yml
index 0b0b79e..f56d01f 100644
--- a/host_vars/vm2.yml
+++ b/host_vars/st0dev0.yml
@@ -1,7 +1,7 @@
-ansible_host: vm2
+ansible_host: st0dev0
 ip:
-  in: 10.10.0.62
-  out: 192.168.5.62
+  in: 10.10.0.60
+  out: 192.168.5.60
 
 virtual: true
 
@@ -11,9 +11,9 @@ services:
     proto: "tcp"
     port: "22"
 
-  - name: "stagit"
+  - name: "cgit"
     proto: "tcp"
-    port: "1234"
+    port: "1235"
     domain: "git"
 
   - name: "gitdeamon"
diff --git a/host_vars/st0gme0.yml b/host_vars/st0gme0.yml
new file mode 100644
index 0000000..e1644d4
--- /dev/null
+++ b/host_vars/st0gme0.yml
@@ -0,0 +1,22 @@
+ansible_host: st0gme0
+ip:
+  in: 10.10.0.62
+  out: 192.168.5.62
+
+virtual: true
+
+services:
+
+  - name: "ssh"
+    proto: "tcp"
+    port: "22"
+
+  - name: "minecraft"
+    proto: "tcp"
+    port: "25565"
+    public: true
+
+  - name: "minecraft"
+    proto: "udp"
+    port: "25565"
+    public: true
diff --git a/host_vars/st0gme1.yml b/host_vars/st0gme1.yml
new file mode 100644
index 0000000..8875f68
--- /dev/null
+++ b/host_vars/st0gme1.yml
@@ -0,0 +1,22 @@
+ansible_host: st0gme1
+ip:
+  in: 10.10.0.63
+  out: 192.168.5.63
+
+virtual: true
+
+services:
+
+  - name: "ssh"
+    proto: "tcp"
+    port: "22"
+
+  - name: "minecraft"
+    proto: "tcp"
+    port: "25565"
+    public: true
+
+  - name: "minecraft"
+    proto: "udp"
+    port: "25565"
+    public: true
diff --git a/host_vars/st0-devel b/host_vars/st0sbx0.yml
index 8c04667..09f9c46 100644
--- a/host_vars/st0-devel
+++ b/host_vars/st0sbx0.yml
@@ -1,7 +1,7 @@
-ansible_host: st0-devel
+ansible_host: st0sbx0
 ip:
-  in: 10.10.0.63
-  out: 192.168.5.63
+  in: 10.10.0.64
+  out: 192.168.5.64
 
 virtual: true
 
diff --git a/host_vars/st0sbx1.yml b/host_vars/st0sbx1.yml
new file mode 100644
index 0000000..6f71178
--- /dev/null
+++ b/host_vars/st0sbx1.yml
@@ -0,0 +1,13 @@
+ansible_host: st0sbx1
+ip:
+  in: 10.10.0.65
+  out: 192.168.5.65
+
+virtual: true
+
+services:
+
+  - name: "ssh"
+    proto: "tcp"
+    port: "22"
+
diff --git a/host_vars/stack0.yml b/host_vars/stack0.yml
index f3a6c81..46afa0d 100644
--- a/host_vars/stack0.yml
+++ b/host_vars/stack0.yml
@@ -13,34 +13,48 @@ services:
 
 vms:
 
-  - name: vm0
-    image: alpine
-    memory: 8G
-    cpu: 4
+  - name: st0dev0
+    image: openbsd
+    memory: 4G
+    cpu: 2
     disks:
-      - { id: 0, size: "16G" }
+      - { id: 0, size: "32G" }
 
-  - name: vm1
-    image: alpine
+  - name: st0cld0
+    image: openbsd
     memory: 4G
     cpu: 2
     disks:
-      - { id: 0, size: "16G" }
+      - { id: 0, size: "64G" }
 
-  - name: vm2
+  - name: st0gme0
     image: openbsd
     memory: 4G
-    cpu: 2
+    cpu: 4
     disks:
-      - { id: 0, size: "4G" }
+      - { id: 0, size: "8G" }
 
-  - name: st0-devel
+  - name: st0gme1
     image: alpine
-    memory: 4G
-    cpu: 2
+    memory: 16G
+    cpu: 4
     disks:
       - { id: 0, size: "8G" }
 
+  - name: st0sbx0
+    image: openbsd
+    memory: 2G
+    cpu: 1
+    disks:
+      - { id: 0, size: "4G" }
+
+  - name: st0sbx1
+    image: alpine
+    memory: 2G
+    cpu: 1
+    disks:
+      - { id: 0, size: "4G" }
+
 hypervisor:
   interface: bce0
   switch: public
diff --git a/host_vars/vm0.yml b/host_vars/vm0.yml
deleted file mode 100644
index 13a6c1f..0000000
--- a/host_vars/vm0.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-ansible_host: vm0
-ip:
-  in: 10.10.0.60
-  out: 192.168.5.60
-
-virtual: true
-
-services:
-
-  - name: "ssh"
-    proto: "tcp"
-    port: "22"
-
-  - name: "minecraft"
-    proto: "tcp"
-    port: "25565"
-    public: true
-
-  - name: "minecraft"
-    proto: "udp"
-    port: "25565"
-    public: true
-
-  - name: "factorio"
-    proto: "udp"
-    port: "34197"
-    public: true
-
-  - name: "ksp"
-    proto: "tcp"
-    port: "8800"
-    public: true
-
-  - name: "ksp"
-    proto: "udp"
-    port: "8800"
-    public: true