summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chaos-at-home/ch-hroottest-obsd.yml8
-rw-r--r--chaos-at-home/ch-hroottest.yml17
-rw-r--r--chaos-at-home/host_vars/ch-hroottest.yml10
-rw-r--r--chaos-at-home/k8s-chtest.yml37
-rw-r--r--inventory/group_vars/k8s-chtest/main.yml44
-rw-r--r--inventory/group_vars/vmhost-ch-hroottest/main.yml25
-rw-r--r--inventory/group_vars/vmhost-sk-2019vm/main.yml4
-rw-r--r--inventory/host_vars/ch-hroottest-obsd.yml26
-rw-r--r--inventory/host_vars/ch-hroottest-vm1.yml37
-rw-r--r--inventory/host_vars/ch-hroottest.yml60
-rw-r--r--inventory/host_vars/ch-k8s-m0.yml45
-rw-r--r--inventory/host_vars/ch-k8s-m1.yml45
-rw-r--r--inventory/host_vars/ch-k8s-m2.yml43
-rw-r--r--inventory/host_vars/ch-k8s-w0.yml43
-rw-r--r--inventory/host_vars/ch-k8s-w1.yml43
-rw-r--r--inventory/hosts.ini42
16 files changed, 2 insertions, 527 deletions
diff --git a/chaos-at-home/ch-hroottest-obsd.yml b/chaos-at-home/ch-hroottest-obsd.yml
deleted file mode 100644
index de0a051a..00000000
--- a/chaos-at-home/ch-hroottest-obsd.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: Basic Setup
- hosts: ch-hroottest-obsd
- roles:
- - role: core/base
- - role: core/sshd
- - role: core/zsh
- - role: core/admin-users
diff --git a/chaos-at-home/ch-hroottest.yml b/chaos-at-home/ch-hroottest.yml
deleted file mode 100644
index d8bc019a..00000000
--- a/chaos-at-home/ch-hroottest.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-- name: Basic Setup
- hosts: ch-hroottest
- roles:
- - role: apt-repo/base
- - role: core/base
- - role: core/sshd
- - role: core/zsh
- - role: core/cpu-microcode
- - role: zfs/base
- - role: apt-repo/spreadspace
- - role: zfs/sanoid
- # - role: vm/host
- # - role: installer/debian/base
- # - role: installer/openbsd/base
- - role: kubernetes/base
- - role: kubernetes/standalone/base
diff --git a/chaos-at-home/host_vars/ch-hroottest.yml b/chaos-at-home/host_vars/ch-hroottest.yml
deleted file mode 100644
index cbab0cdb..00000000
--- a/chaos-at-home/host_vars/ch-hroottest.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-$ANSIBLE_VAULT;1.2;AES256;chaos-at-home
-65373866616230323066396132643136646161663638653433303266316239373062663364663538
-3533366230653363393533306133313366323731643664320a623264363537383338306332656261
-65653066396632626662633861396238316333393839393430663032336366663835653839396430
-3734393337363138620a613631663965396237633037636237333365663234353630343839366664
-64333431353863366666373965373234363439633031303535653064376237633462336165333637
-39363363316533333264643165616634636335646335633065656638326331363664383239613730
-61636366363064323232396439656431386331646365383066313438343639393965356639323565
-38626663643834306431383736306265303035396438643535393035363666323932663961646361
-6131
diff --git a/chaos-at-home/k8s-chtest.yml b/chaos-at-home/k8s-chtest.yml
deleted file mode 100644
index e3daf681..00000000
--- a/chaos-at-home/k8s-chtest.yml
+++ /dev/null
@@ -1,37 +0,0 @@
----
-- name: Basic Node Setup
- hosts: k8s-chtest
- roles:
- - role: apt-repo/base
- - role: core/base
- - role: core/sshd
- - role: core/zsh
-
-- import_playbook: ../common/kubernetes-cluster-layout.yml
- vars:
- kubernetes_cluster_layout:
- nodes_group: k8s-chtest
- masters:
- - ch-k8s-m0
- - ch-k8s-m1
- - ch-k8s-m2
- primary_master: ch-k8s-m0
-
-### hack hack hack...
-- name: cook kubernetes secrets
- hosts: _kubernetes_nodes_
- gather_facts: no
- tasks:
- - set_fact:
- kubernetes_secrets_cooked: "{{ kubernetes_secrets }}"
- - when: external_ip is defined
- set_fact:
- external_ip_cooked: "{{ external_ip }}"
-
-- import_playbook: ../common/kubernetes-cluster.yml
-- import_playbook: ../common/kubernetes-cluster-cleanup.yml
-
-- name: install addons
- hosts: _kubernetes_primary_master_
- roles:
- - role: kubernetes/addons/metrics-server
diff --git a/inventory/group_vars/k8s-chtest/main.yml b/inventory/group_vars/k8s-chtest/main.yml
deleted file mode 100644
index a7fe0120..00000000
--- a/inventory/group_vars/k8s-chtest/main.yml
+++ /dev/null
@@ -1,44 +0,0 @@
----
-docker_pkg_provider: docker-com
-docker_pkg_name: docker-ce
-
-kubernetes_version: 1.18.3
-kubernetes_container_runtime: docker
-kubernetes_network_plugin: kubeguard
-kubernetes_network_plugin_replaces_kube_proxy: true
-kubernetes_network_plugin_variant: with-kube-router
-kubernetes_network_plugin_version: 0.4.0
-
-kubernetes:
- cluster_name: chtest
-
- dedicated_master: True
- api_extra_sans:
- - 178.63.180.139
- - 178.63.180.140
-
- pod_ip_range: 172.18.0.0/16
- pod_ip_range_size: 24
- service_ip_range: 172.18.192.0/18
-
-
-kubernetes_secrets:
- encryption_config_keys: "{{ vault_kubernetes_encryption_config_keys }}"
-
-
-kubeguard:
- ## node_index must be in the range between 1 and 190 -> 189 hosts possible
- ##
- ## hardcoded hostnames are not nice but if we do this via host_vars
- ## the info is spread over multiple files and this makes it more diffcult
- ## to find mistakes, so it is nicer to keep it in one place...
- node_index:
- ch-k8s-w0: 1
- ch-k8s-w1: 2
- ch-k8s-m0: 100
- ch-k8s-m1: 101
- ch-k8s-m2: 102
-
-kubernetes_overlay_node_ip: "{{ kubernetes.pod_ip_range | ipsubnet(kubernetes.pod_ip_range_size, kubeguard.node_index[inventory_hostname]) | ipaddr(1) | ipaddr('address') }}"
-
-kubernetes_metrics_server_version: 0.3.6
diff --git a/inventory/group_vars/vmhost-ch-hroottest/main.yml b/inventory/group_vars/vmhost-ch-hroottest/main.yml
deleted file mode 100644
index 84c826b1..00000000
--- a/inventory/group_vars/vmhost-ch-hroottest/main.yml
+++ /dev/null
@@ -1,25 +0,0 @@
----
-vm_host:
- name: ch-hroottest
- network:
- dns:
- - 213.133.100.100
- - 213.133.98.98
- - 213.133.99.99
- bridges:
- public:
- prefix: 192.168.250.0/24
- offsets:
- ch-hroottest-vm1: 100
- ch-hroottest-obsd: 101
- ch-k8s-m2: 200
- ch-k8s-w0: 210
- ch-k8s-w1: 211
- ch-hroottest: 254
- nat: yes
- zfs:
- default:
- pool: storage
- name: vm
- properties:
- compression: lz4
diff --git a/inventory/group_vars/vmhost-sk-2019vm/main.yml b/inventory/group_vars/vmhost-sk-2019vm/main.yml
index 93f7948c..254d6d8b 100644
--- a/inventory/group_vars/vmhost-sk-2019vm/main.yml
+++ b/inventory/group_vars/vmhost-sk-2019vm/main.yml
@@ -14,8 +14,6 @@ vm_host:
# emc-master: 137
lw-master: 137
ele-gwhetzner: 138
- ch-k8s-m0: 139
- ch-k8s-m1: 140
ch-mimas: 142
sk-testvm: 253
sk-2019vm: 254
@@ -27,8 +25,6 @@ vm_host:
# emc-master: 1
lw-master: 1
ele-gwhetzner: 2
- ch-k8s-m0: 3
- ch-k8s-m1: 4
ch-mimas: 6
sk-testvm: 7
zfs:
diff --git a/inventory/host_vars/ch-hroottest-obsd.yml b/inventory/host_vars/ch-hroottest-obsd.yml
deleted file mode 100644
index 96ec2fe2..00000000
--- a/inventory/host_vars/ch-hroottest-obsd.yml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-install:
- vm:
- memory: 1G
- numcpus: 1
- autostart: True
- disks:
- primary: /dev/vda
- virtio:
- vda:
- type: zfs
- name: root
- size: 10g
- interfaces:
- - bridge: br-public
- name: vio0
-
-network:
- nameservers: "{{ vm_host.network.dns }}"
- domain: "{{ host_domain }}"
- primary: &_network_primary_
- name: vio0
- address: "{{ vm_host.network.bridges.public.prefix | ipaddr(vm_host.network.bridges.public.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
- gateway: "{{ vm_host.network.bridges.public.prefix | ipaddr(vm_host.network.bridges.public.offsets[vm_host.name]) | ipaddr('address') }}"
- interfaces:
- - *_network_primary_
diff --git a/inventory/host_vars/ch-hroottest-vm1.yml b/inventory/host_vars/ch-hroottest-vm1.yml
deleted file mode 100644
index a7f45252..00000000
--- a/inventory/host_vars/ch-hroottest-vm1.yml
+++ /dev/null
@@ -1,37 +0,0 @@
----
-install:
- vm:
- memory: 4G
- numcpus: 4
- autostart: True
- disks:
- primary: /dev/sda
- scsi:
- sda:
- type: zfs
- name: root
- size: 20g
- properties:
- refreservation: none
- sdb:
- type: zfs
- name: data
- size: 100g
- properties:
- refreservation: none
- compression: off
- interfaces:
- - bridge: br-public
- name: primary0
-
-network:
- nameservers: "{{ vm_host.network.dns }}"
- domain: "{{ host_domain }}"
- systemd_link:
- interfaces: "{{ install.interfaces }}"
- primary: &_network_primary_
- name: primary0
- address: "{{ vm_host.network.bridges.public.prefix | ipaddr(vm_host.network.bridges.public.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
- gateway: "{{ vm_host.network.bridges.public.prefix | ipaddr(vm_host.network.bridges.public.offsets[vm_host.name]) | ipaddr('address') }}"
- interfaces:
- - *_network_primary_
diff --git a/inventory/host_vars/ch-hroottest.yml b/inventory/host_vars/ch-hroottest.yml
deleted file mode 100644
index 4ed4449f..00000000
--- a/inventory/host_vars/ch-hroottest.yml
+++ /dev/null
@@ -1,60 +0,0 @@
----
-install:
- cloud:
- credentials: "{{ vault_hroot_robot_account }}"
- server_name: "{{ host_name }}"
- disks:
- primary: software-raid
- raid:
- level: 1
- members:
- - /dev/sda
- - /dev/sdb
- root_lvm_size: 10G
-
-network:
- nameservers: "{{ vm_host.network.dns }}"
- domain: "{{ host_domain }}"
- interfaces:
- - name: br-public
- address: "{{ vm_host.network.bridges.public.prefix | ipaddr(vm_host.network.bridges.public.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
-
-
-apt_repo_components:
- - main
- - contrib ## for zfs
- - non-free ## for microcode updates
-
-
-zfs_arc_size:
- min: "{{ 1 * 1024 * 1024 * 1024 }}"
- max: "{{ 4 * 1024 * 1024 * 1024 }}"
-
-zfs_zpools:
- storage:
- mountpoint: /srv/storage
- create_vdevs: mirror /dev/disk/by-id/ata-SAMSUNG_HD753LJ_S13UJ1LS801071-part3 /dev/disk/by-id/ata-SAMSUNG_HD753LJ_S13UJ1BQ802393-part3
-
-# zfs_sanoid_modules:
-# storage/vm:
-# use_template: production
-# recursive: yes
-# process_children_only: yes
-
-docker_zfs:
- pool: storage
- name: docker
- properties:
- quota: 15G
-
-kubelet_zfs:
- pool: storage
- name: kubelet
- properties:
- quota: 15G
-
-kubernetes_version: 1.18.5
-kubernetes_container_runtime: docker
-kubernetes_standalone_max_pods: 15
-kubernetes_standalone_pod_cidr: 192.168.255.0/24
-kubernetes_standalone_cni_variant: with-portmap
diff --git a/inventory/host_vars/ch-k8s-m0.yml b/inventory/host_vars/ch-k8s-m0.yml
deleted file mode 100644
index 7d81b792..00000000
--- a/inventory/host_vars/ch-k8s-m0.yml
+++ /dev/null
@@ -1,45 +0,0 @@
----
-install:
- vm:
- memory: 4G
- numcpus: 2
- autostart: True
- disks:
- primary: /dev/sda
- scsi:
- sda:
- type: zfs
- name: root
- size: 20g
- properties:
- refreservation: none
- interfaces:
- - bridge: br-public
- name: primary0
-
-network:
- nameservers: "{{ vm_host.network.dns }}"
- domain: "{{ host_domain }}"
- systemd_link:
- interfaces: "{{ install.interfaces }}"
- primary: &_network_primary_
- name: primary0
- address: "{{ vm_host.network.bridges.public.prefix | ipaddr(vm_host.network.bridges.public.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
- gateway: "{{ vm_host.network.bridges.public.prefix | ipaddr(vm_host.network.bridges.public.offsets[vm_host.name]) | ipaddr('address') }}"
- overlay: "{{ (vm_host.network.bridges.public.overlay.prefix | ipaddr(vm_host.network.bridges.public.overlay.offsets[inventory_hostname])).split('/')[0] }}"
- interfaces:
- - *_network_primary_
-
-external_ip: "{{ network.primary.overlay }}"
-
-docker_lvm:
- vg: "{{ host_name }}"
- lv: docker
- size: 7G
- fs: ext4
-
-kubelet_lvm:
- vg: "{{ host_name }}"
- lv: kubelet
- size: 5G
- fs: ext4
diff --git a/inventory/host_vars/ch-k8s-m1.yml b/inventory/host_vars/ch-k8s-m1.yml
deleted file mode 100644
index 7d81b792..00000000
--- a/inventory/host_vars/ch-k8s-m1.yml
+++ /dev/null
@@ -1,45 +0,0 @@
----
-install:
- vm:
- memory: 4G
- numcpus: 2
- autostart: True
- disks:
- primary: /dev/sda
- scsi:
- sda:
- type: zfs
- name: root
- size: 20g
- properties:
- refreservation: none
- interfaces:
- - bridge: br-public
- name: primary0
-
-network:
- nameservers: "{{ vm_host.network.dns }}"
- domain: "{{ host_domain }}"
- systemd_link:
- interfaces: "{{ install.interfaces }}"
- primary: &_network_primary_
- name: primary0
- address: "{{ vm_host.network.bridges.public.prefix | ipaddr(vm_host.network.bridges.public.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
- gateway: "{{ vm_host.network.bridges.public.prefix | ipaddr(vm_host.network.bridges.public.offsets[vm_host.name]) | ipaddr('address') }}"
- overlay: "{{ (vm_host.network.bridges.public.overlay.prefix | ipaddr(vm_host.network.bridges.public.overlay.offsets[inventory_hostname])).split('/')[0] }}"
- interfaces:
- - *_network_primary_
-
-external_ip: "{{ network.primary.overlay }}"
-
-docker_lvm:
- vg: "{{ host_name }}"
- lv: docker
- size: 7G
- fs: ext4
-
-kubelet_lvm:
- vg: "{{ host_name }}"
- lv: kubelet
- size: 5G
- fs: ext4
diff --git a/inventory/host_vars/ch-k8s-m2.yml b/inventory/host_vars/ch-k8s-m2.yml
deleted file mode 100644
index 6de6fbfb..00000000
--- a/inventory/host_vars/ch-k8s-m2.yml
+++ /dev/null
@@ -1,43 +0,0 @@
----
-install:
- vm:
- memory: 4G
- numcpus: 2
- autostart: True
- disks:
- primary: /dev/sda
- scsi:
- sda:
- type: zfs
- name: root
- size: 20g
- properties:
- refreservation: none
- interfaces:
- - bridge: br-public
- name: primary0
-
-network:
- nameservers: "{{ vm_host.network.dns }}"
- domain: "{{ host_domain }}"
- systemd_link:
- interfaces: "{{ install.interfaces }}"
- primary: &_network_primary_
- name: primary0
- address: "{{ vm_host.network.bridges.public.prefix | ipaddr(vm_host.network.bridges.public.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
- gateway: "{{ vm_host.network.bridges.public.prefix | ipaddr(vm_host.network.bridges.public.offsets[vm_host.name]) | ipaddr('address') }}"
- interfaces:
- - *_network_primary_
-
-
-docker_lvm:
- vg: "{{ host_name }}"
- lv: docker
- size: 7G
- fs: ext4
-
-kubelet_lvm:
- vg: "{{ host_name }}"
- lv: kubelet
- size: 5G
- fs: ext4
diff --git a/inventory/host_vars/ch-k8s-w0.yml b/inventory/host_vars/ch-k8s-w0.yml
deleted file mode 100644
index 51095a86..00000000
--- a/inventory/host_vars/ch-k8s-w0.yml
+++ /dev/null
@@ -1,43 +0,0 @@
----
-install:
- vm:
- memory: 4G
- numcpus: 4
- autostart: True
- disks:
- primary: /dev/sda
- scsi:
- sda:
- type: zfs
- name: root
- size: 100g
- properties:
- refreservation: none
- interfaces:
- - bridge: br-public
- name: primary0
-
-network:
- nameservers: "{{ vm_host.network.dns }}"
- domain: "{{ host_domain }}"
- systemd_link:
- interfaces: "{{ install.interfaces }}"
- primary: &_network_primary_
- name: primary0
- address: "{{ vm_host.network.bridges.public.prefix | ipaddr(vm_host.network.bridges.public.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
- gateway: "{{ vm_host.network.bridges.public.prefix | ipaddr(vm_host.network.bridges.public.offsets[vm_host.name]) | ipaddr('address') }}"
- interfaces:
- - *_network_primary_
-
-
-docker_lvm:
- vg: "{{ host_name }}"
- lv: docker
- size: 15G
- fs: ext4
-
-kubelet_lvm:
- vg: "{{ host_name }}"
- lv: kubelet
- size: 15G
- fs: ext4
diff --git a/inventory/host_vars/ch-k8s-w1.yml b/inventory/host_vars/ch-k8s-w1.yml
deleted file mode 100644
index 51095a86..00000000
--- a/inventory/host_vars/ch-k8s-w1.yml
+++ /dev/null
@@ -1,43 +0,0 @@
----
-install:
- vm:
- memory: 4G
- numcpus: 4
- autostart: True
- disks:
- primary: /dev/sda
- scsi:
- sda:
- type: zfs
- name: root
- size: 100g
- properties:
- refreservation: none
- interfaces:
- - bridge: br-public
- name: primary0
-
-network:
- nameservers: "{{ vm_host.network.dns }}"
- domain: "{{ host_domain }}"
- systemd_link:
- interfaces: "{{ install.interfaces }}"
- primary: &_network_primary_
- name: primary0
- address: "{{ vm_host.network.bridges.public.prefix | ipaddr(vm_host.network.bridges.public.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
- gateway: "{{ vm_host.network.bridges.public.prefix | ipaddr(vm_host.network.bridges.public.offsets[vm_host.name]) | ipaddr('address') }}"
- interfaces:
- - *_network_primary_
-
-
-docker_lvm:
- vg: "{{ host_name }}"
- lv: docker
- size: 15G
- fs: ext4
-
-kubelet_lvm:
- vg: "{{ host_name }}"
- lv: kubelet
- size: 15G
- fs: ext4
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index bd6add33..28fa65d3 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -25,9 +25,7 @@ ch-router-obsd host_name=router
ch-gw-lan host_name=gw-lan
ch-jump host_name=jump ansible_port=2342 ansible_host=ch-jump
ch-nic host_name=nic
-ch-hroottest host_name=hroot-test
-ch-hroottest-vm1 host_name=hroot-test-vm1
-ch-hroottest-obsd host_name=hroot-test-obsd
+ch-hclouttest host_name=hcloud-test
ch-oulu host_name=oulu host_domain=helsinki.at
[chaos-at-home:children]
@@ -56,13 +54,6 @@ ch-ap1 host_name=ap1
ch-router
ch-pan
-[chaos-at-home-k8s]
-ch-k8s-m0 host_name=k8s-master0
-ch-k8s-m1 host_name=k8s-master1
-ch-k8s-m2 host_name=k8s-master2
-ch-k8s-w0 host_name=k8s-worker0
-ch-k8s-w1 host_name=k8s-worker1
-
[realraum:vars]
host_domain=realraum.at
@@ -218,7 +209,6 @@ chaos-at-home-switches
[openbsd]
ch-router-obsd
-ch-hroottest-obsd
## virtualization
@@ -243,22 +233,11 @@ ch-atlas
[vmhost-ch-atlas:children]
vmhost-ch-atlas-guests
-[vmhost-ch-hroottest-guests]
-ch-hroottest-vm1
-ch-hroottest-obsd
-ch-k8s-m2
-ch-k8s-w[0:1]
-[vmhost-ch-hroottest]
-ch-hroottest
-[vmhost-ch-hroottest:children]
-vmhost-ch-hroottest-guests
-
[vmhost-sk-2019vm-guests]
sk-testvm
sk-torrent
ch-mimas
ele-gwhetzner
-ch-k8s-m[0:1]
emc-master
lw-master
[vmhost-sk-2019vm]
@@ -278,14 +257,12 @@ vmhost-sk-tomnext-guests
[kvmhosts]
ch-gnocchi
ch-atlas
-ch-hroottest
sk-2019vm
sk-tomnext
[kvmguests:children]
vmhost-ch-gnocchi-guests
vmhost-ch-atlas-guests
-vmhost-ch-hroottest-guests
vmhost-sk-2019vm-guests
vmhost-sk-tomnext-guests
@@ -296,11 +273,11 @@ sk-2019
sk-cloudia
sk-2019vm
sk-tomnext
-ch-hroottest
[hcloud]
ch-mimas2
ele-lt
+ch-hcloudtest
[hcloud:children]
emc-dist
@@ -313,8 +290,6 @@ emc-master
lw-master
sk-testvm
sk-torrent
-ch-hroottest-vm1
-ch-hroottest-obsd
[hetzner:children]
hroot
@@ -358,7 +333,6 @@ sk-cloudia
ele-thetys
lw-thetys
sk-tomnext-nc
-ch-hroottest
[kubernetes:children]
kubernetes-cluster
@@ -406,15 +380,3 @@ k8s-lwl-master
k8s-lwl-encoder
k8s-lwl-distribution
k8s-lwl-streamer
-
-
-### Kubernetes Cluster: ch-test
-[k8s-chtest-master]
-ch-k8s-m[0:2]
-
-[k8s-chtest-worker]
-ch-k8s-w[0:1]
-
-[k8s-chtest:children]
-k8s-chtest-master
-k8s-chtest-worker
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-05 03:05:22 +0000