From 5e845b2f8d5023ed2bf6bbee697839ff4e062fc9 Mon Sep 17 00:00:00 2001 From: binary Date: Tue, 19 Jan 2021 20:53:45 +0100 Subject: Rename hosts --- group_vars/all.yml | 2 +- host_vars/dc0.yml | 20 ++++++++++++++++++++ host_vars/dcontroller.yml | 20 -------------------- host_vars/st0-devel | 13 ------------- host_vars/st0cld0.yml | 16 ++++++++++++++++ host_vars/st0dev0.yml | 27 +++++++++++++++++++++++++++ host_vars/st0gme0.yml | 22 ++++++++++++++++++++++ host_vars/st0gme1.yml | 22 ++++++++++++++++++++++ host_vars/st0sbx0.yml | 13 +++++++++++++ host_vars/st0sbx1.yml | 13 +++++++++++++ host_vars/stack0.yml | 42 ++++++++++++++++++++++++++++-------------- host_vars/vm0.yml | 37 ------------------------------------- host_vars/vm1.yml | 13 ------------- host_vars/vm2.yml | 27 --------------------------- 14 files changed, 162 insertions(+), 125 deletions(-) create mode 100644 host_vars/dc0.yml delete mode 100644 host_vars/dcontroller.yml delete mode 100644 host_vars/st0-devel create mode 100644 host_vars/st0cld0.yml create mode 100644 host_vars/st0dev0.yml create mode 100644 host_vars/st0gme0.yml create mode 100644 host_vars/st0gme1.yml create mode 100644 host_vars/st0sbx0.yml create mode 100644 host_vars/st0sbx1.yml delete mode 100644 host_vars/vm0.yml delete mode 100644 host_vars/vm1.yml delete mode 100644 host_vars/vm2.yml 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/dc0.yml b/host_vars/dc0.yml new file mode 100644 index 0000000..a54d009 --- /dev/null +++ b/host_vars/dc0.yml @@ -0,0 +1,20 @@ +ansible_host: dc0 +virtual: true + +ip: + in: 10.10.0.1 + out: 185.203.114.234 + +services: + + - name: "ssh" + proto: "tcp" + port: "22" + + - name: "wireguard" + proto: "udp" + port: "53" + + - name: "httpd" + proto: "tcp" + port: "80" diff --git a/host_vars/dcontroller.yml b/host_vars/dcontroller.yml deleted file mode 100644 index 2194216..0000000 --- a/host_vars/dcontroller.yml +++ /dev/null @@ -1,20 +0,0 @@ -ansible_host: dcontroller -virtual: true - -ip: - in: 10.10.0.1 - out: 185.203.114.234 - -services: - - - name: "ssh" - proto: "tcp" - port: "22" - - - name: "wireguard" - proto: "udp" - port: "53" - - - name: "httpd" - proto: "tcp" - port: "80" diff --git a/host_vars/st0-devel b/host_vars/st0-devel deleted file mode 100644 index 8c04667..0000000 --- a/host_vars/st0-devel +++ /dev/null @@ -1,13 +0,0 @@ -ansible_host: st0-devel -ip: - in: 10.10.0.63 - out: 192.168.5.63 - -virtual: true - -services: - - - name: "ssh" - proto: "tcp" - port: "22" - diff --git a/host_vars/st0cld0.yml b/host_vars/st0cld0.yml new file mode 100644 index 0000000..c668e4d --- /dev/null +++ b/host_vars/st0cld0.yml @@ -0,0 +1,16 @@ +ansible_host: st0cld0 +ip: + in: 10.10.0.61 + out: 192.168.5.61 + +virtual: true + +services: + + - name: "ssh" + proto: "tcp" + port: "22" + + - name: "grafana" + proto: "tcp" + port: "3000" diff --git a/host_vars/st0dev0.yml b/host_vars/st0dev0.yml new file mode 100644 index 0000000..f56d01f --- /dev/null +++ b/host_vars/st0dev0.yml @@ -0,0 +1,27 @@ +ansible_host: st0dev0 +ip: + in: 10.10.0.60 + out: 192.168.5.60 + +virtual: true + +services: + + - name: "ssh" + proto: "tcp" + port: "22" + + - name: "cgit" + proto: "tcp" + port: "1235" + domain: "git" + + - name: "gitdeamon" + proto: "tcp" + port: "9418" + public: true + + - name: "gitdeamon" + proto: "udp" + port: "9418" + public: true 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/st0sbx0.yml b/host_vars/st0sbx0.yml new file mode 100644 index 0000000..09f9c46 --- /dev/null +++ b/host_vars/st0sbx0.yml @@ -0,0 +1,13 @@ +ansible_host: st0sbx0 +ip: + in: 10.10.0.64 + out: 192.168.5.64 + +virtual: true + +services: + + - name: "ssh" + proto: "tcp" + port: "22" + 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 diff --git a/host_vars/vm1.yml b/host_vars/vm1.yml deleted file mode 100644 index c213f8b..0000000 --- a/host_vars/vm1.yml +++ /dev/null @@ -1,13 +0,0 @@ -ansible_host: vm1 -ip: - in: 10.10.0.61 - out: 192.168.5.61 - -virtual: true - -services: - - - name: "ssh" - proto: "tcp" - port: "22" - diff --git a/host_vars/vm2.yml b/host_vars/vm2.yml deleted file mode 100644 index 0b0b79e..0000000 --- a/host_vars/vm2.yml +++ /dev/null @@ -1,27 +0,0 @@ -ansible_host: vm2 -ip: - in: 10.10.0.62 - out: 192.168.5.62 - -virtual: true - -services: - - - name: "ssh" - proto: "tcp" - port: "22" - - - name: "stagit" - proto: "tcp" - port: "1234" - domain: "git" - - - name: "gitdeamon" - proto: "tcp" - port: "9418" - public: true - - - name: "gitdeamon" - proto: "udp" - port: "9418" - public: true -- cgit v1.2.3