summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2022-10-15 17:00:28 +0200
committerChristian Pointner <equinox@spreadspace.org>2022-10-15 17:00:28 +0200
commita500cd841ab3fd99d1574396ece2552d83307772 (patch)
treef707c6506ded694cc7da3d376b5b5d737b25c5ee
parentrename mimas to mimas-legacy and re-install ch-mimas2 as ch-mimas (diff)
remove ch-keyserver
-rw-r--r--chaos-at-home/ch-keyserver.yml9
-rw-r--r--inventory/group_vars/vmhost-ch-atlas/vars.yml1
-rw-r--r--inventory/host_vars/ch-keyserver.yml32
-rw-r--r--inventory/hosts.ini2
4 files changed, 0 insertions, 44 deletions
diff --git a/chaos-at-home/ch-keyserver.yml b/chaos-at-home/ch-keyserver.yml
deleted file mode 100644
index 11942ffc..00000000
--- a/chaos-at-home/ch-keyserver.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- name: Basic Setup
- hosts: ch-keyserver
- roles:
- - role: apt-repo/base
- - role: core/base
- - role: core/sshd/base
- - role: core/zsh
- - role: core/admin-users
diff --git a/inventory/group_vars/vmhost-ch-atlas/vars.yml b/inventory/group_vars/vmhost-ch-atlas/vars.yml
index a785e224..f6e83cdf 100644
--- a/inventory/group_vars/vmhost-ch-atlas/vars.yml
+++ b/inventory/group_vars/vmhost-ch-atlas/vars.yml
@@ -14,7 +14,6 @@ vm_host:
prefix6: 2a02:3e0:407::/64
gateway6: 2a02:3e0:407::1
offsets:
- ch-keyserver: 3
ch-testvm-atlas: 4
ele-mur: 5
r3-vex2: 11
diff --git a/inventory/host_vars/ch-keyserver.yml b/inventory/host_vars/ch-keyserver.yml
deleted file mode 100644
index c2b62d81..00000000
--- a/inventory/host_vars/ch-keyserver.yml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-install:
- vm:
- memory: 2G
- numcpus: 2
- autostart: True
- disks:
- primary: /dev/sda
- scsi:
- sda:
- type: lvm
- vg: "{{ hostvars[vm_host.name].host_name }}"
- lv: "{{ inventory_hostname }}"
- size: 10g
- interfaces:
- - bridge: br-public
- name: primary0
- mac: 52:54:00:f9:e6:7f
-
-network:
- nameservers: "{{ hostvars[_vm_host_].vm_host.network.dns }}"
- domain: "{{ host_domain }}"
- systemd_link:
- interfaces: "{{ install.interfaces }}"
- primary: &_network_primary_
- name: primary0
- address: "{{ vm_host.network.bridges.public.prefix | ansible.utils.ipaddr(vm_host.network.bridges.public.offsets[inventory_hostname]) }}"
- gateway: "{{ vm_host.network.bridges.public.gateway }}"
- address6: "{{ vm_host.network.bridges.public.prefix6 | ansible.utils.ipaddr(vm_host.network.bridges.public.offsets[inventory_hostname]) }}"
- gateway6: "{{ vm_host.network.bridges.public.gateway6 }}"
- interfaces:
- - *_network_primary_
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index cb8ce25a..a9eb2b46 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -40,7 +40,6 @@ ch-mclr host_name=mclr
ch-mcbr host_name=mcbr
ch-atlas host_name=atlas
ch-pan host_name=pan
-ch-keyserver host_name=keyserver
ch-testvm-atlas host_name=testvm-atlas
ch-mimas-legacy host_name=mimas
ch-mimas host_name=mimas
@@ -357,7 +356,6 @@ vmhost-ch-prometheus-guests
ch-testvm-atlas
ele-mur
r3-vex2
-ch-keyserver
[vmhost-ch-atlas]
ch-atlas
[vmhost-ch-atlas:children]