From d9bc85387db33647e911e3e5ee5fed95cd208310 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sat, 4 Jul 2020 02:14:16 +0200 Subject: remove: ch k8s cluster vms, and hroot-test, add hcloud-test --- inventory/group_vars/k8s-chtest/main.yml | 44 ----------------- inventory/group_vars/vmhost-ch-hroottest/main.yml | 25 ---------- inventory/group_vars/vmhost-sk-2019vm/main.yml | 4 -- inventory/host_vars/ch-hroottest-obsd.yml | 26 ---------- inventory/host_vars/ch-hroottest-vm1.yml | 37 -------------- inventory/host_vars/ch-hroottest.yml | 60 ----------------------- inventory/host_vars/ch-k8s-m0.yml | 45 ----------------- inventory/host_vars/ch-k8s-m1.yml | 45 ----------------- inventory/host_vars/ch-k8s-m2.yml | 43 ---------------- inventory/host_vars/ch-k8s-w0.yml | 43 ---------------- inventory/host_vars/ch-k8s-w1.yml | 43 ---------------- inventory/hosts.ini | 42 +--------------- 12 files changed, 2 insertions(+), 455 deletions(-) delete mode 100644 inventory/group_vars/k8s-chtest/main.yml delete mode 100644 inventory/group_vars/vmhost-ch-hroottest/main.yml delete mode 100644 inventory/host_vars/ch-hroottest-obsd.yml delete mode 100644 inventory/host_vars/ch-hroottest-vm1.yml delete mode 100644 inventory/host_vars/ch-hroottest.yml delete mode 100644 inventory/host_vars/ch-k8s-m0.yml delete mode 100644 inventory/host_vars/ch-k8s-m1.yml delete mode 100644 inventory/host_vars/ch-k8s-m2.yml delete mode 100644 inventory/host_vars/ch-k8s-w0.yml delete mode 100644 inventory/host_vars/ch-k8s-w1.yml (limited to 'inventory') 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 -- cgit v1.2.3