diff options
author | Christian Pointner <equinox@spreadspace.org> | 2022-08-15 01:50:01 +0200 |
---|---|---|
committer | Christian Pointner <equinox@spreadspace.org> | 2022-08-15 01:50:01 +0200 |
commit | f4b33dcd0dbe0528e9328566b163773ac5de9ec9 (patch) | |
tree | 3b2a4c33a834c60c48d970bd14fb76cebb52d9f3 | |
parent | kubernetes/kubeadm: dust-off upgrade readme (diff) |
elevate mediachannel: refactor group and hostnames
-rw-r--r-- | dan/ele-emc-ctrl.yml (renamed from dan/emc-ctrl.yml) | 8 | ||||
-rw-r--r-- | dan/emc-00.yml | 22 | ||||
-rw-r--r-- | dan/emc-cdn.yml (renamed from dan/emc-dist.yml) | 6 | ||||
-rw-r--r-- | dan/emc-xx.yml | 22 | ||||
-rw-r--r-- | dan/group_vars/elevate-mediachannel.yml (renamed from dan/group_vars/emc.yml) | 0 | ||||
-rw-r--r-- | dan/k8s-emc.yml | 4 | ||||
-rw-r--r-- | inventory/group_vars/elevate-mediachannel/vars.yml (renamed from inventory/group_vars/emc/vars.yml) | 6 | ||||
-rw-r--r-- | inventory/group_vars/emc-dist/vars.yml | 2 | ||||
-rw-r--r-- | inventory/group_vars/emc-xx/vars.yml | 5 | ||||
-rw-r--r-- | inventory/group_vars/k8s-emc/vars.yml | 19 | ||||
-rw-r--r-- | inventory/group_vars/vmhost-sk-2019vm/vars.yml | 4 | ||||
-rw-r--r-- | inventory/host_vars/ele-emc-ctrl.yml (renamed from inventory/host_vars/emc-ctrl.yml) | 0 | ||||
-rw-r--r-- | inventory/hosts.ini | 122 |
13 files changed, 79 insertions, 141 deletions
diff --git a/dan/emc-ctrl.yml b/dan/ele-emc-ctrl.yml index 9d795ef9..fc6456cb 100644 --- a/dan/emc-ctrl.yml +++ b/dan/ele-emc-ctrl.yml @@ -1,14 +1,18 @@ --- - name: Basic Setup - hosts: emc-ctrl + hosts: ele-emc-ctrl roles: - role: apt-repo/base - role: core/base - role: core/sshd/base - role: core/zsh - role: core/ntp + +- name: Payload Setup + hosts: ele-emc-ctrl + roles: - role: apt-repo/spreadspace - role: nginx/base - - role: monitoring/prometheus/exporter +# - role: monitoring/prometheus/exporter - role: storage/lvm/groups - role: elevate/emc-stats diff --git a/dan/emc-00.yml b/dan/emc-00.yml deleted file mode 100644 index adf919fe..00000000 --- a/dan/emc-00.yml +++ /dev/null @@ -1,22 +0,0 @@ ---- -- name: Basic Setup - hosts: emc-00 - roles: - - role: apt-repo/base - - role: core/base - - role: core/sshd/base - - role: core/zsh - - role: core/ntp - - role: apt-repo/spreadspace - - role: nginx/base - - role: monitoring/prometheus/exporter - - role: acmetool/base - - role: acmetool/cert - acmetool_cert_name: emc-live.elev8.at - - role: acmetool/cert - acmetool_cert_name: emc-stats.elev8.at - - role: acmetool/cert - acmetool_cert_name: stream.elev8.at - acmetool_cert_hostnames: - - stream.elev8.at - - stream.elevate.at diff --git a/dan/emc-dist.yml b/dan/emc-cdn.yml index 62c5a1ef..5f34d3ef 100644 --- a/dan/emc-dist.yml +++ b/dan/emc-cdn.yml @@ -7,6 +7,10 @@ - role: core/sshd/base - role: core/zsh - role: core/ntp + +- name: Payload Setup + hosts: "{{ install_hostname }}" + roles: - role: apt-repo/spreadspace - role: nginx/base - - role: monitoring/prometheus/exporter +# - role: monitoring/prometheus/exporter diff --git a/dan/emc-xx.yml b/dan/emc-xx.yml deleted file mode 100644 index 6de17b55..00000000 --- a/dan/emc-xx.yml +++ /dev/null @@ -1,22 +0,0 @@ ---- -- name: Basic Setup - hosts: "{{ install_hostname }}" - roles: - - role: apt-repo/base - - role: core/base - - role: core/sshd/base - - role: core/zsh - - role: core/ntp - - role: apt-repo/spreadspace - - role: nginx/base - - role: monitoring/prometheus/exporter - - role: acmetool/base - - role: acmetool/cert - acmetool_cert_name: "{{ host_name }}.{{ host_domain }}" - - role: storage/lvm/volume - lvm_volume: - vg: "{{ host_name }}" - lv: cache - size: 1536M - fs: ext4 - dest: /srv/cache diff --git a/dan/group_vars/emc.yml b/dan/group_vars/elevate-mediachannel.yml index 311fbe31..311fbe31 100644 --- a/dan/group_vars/emc.yml +++ b/dan/group_vars/elevate-mediachannel.yml diff --git a/dan/k8s-emc.yml b/dan/k8s-emc.yml index 33897dba..fd74a209 100644 --- a/dan/k8s-emc.yml +++ b/dan/k8s-emc.yml @@ -9,14 +9,14 @@ - role: core/ntp - role: apt-repo/spreadspace - role: nginx/base - - role: monitoring/prometheus/exporter +# - role: monitoring/prometheus/exporter - import_playbook: ../common/kubernetes-cluster-layout.yml vars: kubernetes_cluster_layout: nodes_group: k8s-emc controlplane_nodes: - - emc-ctrl + - ele-emc-ctrl ### hack hack hack... - name: cook kubernetes secrets diff --git a/inventory/group_vars/emc/vars.yml b/inventory/group_vars/elevate-mediachannel/vars.yml index b6647745..0e3dc245 100644 --- a/inventory/group_vars/emc/vars.yml +++ b/inventory/group_vars/elevate-mediachannel/vars.yml @@ -1,4 +1,6 @@ --- +install_playbook: emc-cdn + zsh_banner: elevate system_lvm_volume_size_root: 3G @@ -20,12 +22,12 @@ containerd_storage: type: lvm vg: "{{ host_name }}" lv: containerd - size: 15G + size: 5G fs: ext4 kubelet_storage: type: lvm vg: "{{ host_name }}" lv: kubelet - size: 10G + size: 5G fs: ext4 diff --git a/inventory/group_vars/emc-dist/vars.yml b/inventory/group_vars/emc-dist/vars.yml deleted file mode 100644 index be878b51..00000000 --- a/inventory/group_vars/emc-dist/vars.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -install_playbook: emc-dist diff --git a/inventory/group_vars/emc-xx/vars.yml b/inventory/group_vars/emc-xx/vars.yml deleted file mode 100644 index 1e0dd476..00000000 --- a/inventory/group_vars/emc-xx/vars.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -acmetool_account_email: equinox@spreadspace.org -acmetool_directory_server: "{{ acmetool_directory_server_le_live_v2 }}" - -install_playbook: emc-xx diff --git a/inventory/group_vars/k8s-emc/vars.yml b/inventory/group_vars/k8s-emc/vars.yml index c8ad06e4..2a41746b 100644 --- a/inventory/group_vars/k8s-emc/vars.yml +++ b/inventory/group_vars/k8s-emc/vars.yml @@ -1,5 +1,5 @@ --- -kubernetes_version: 1.24.2 +kubernetes_version: 1.24.3 kubernetes_cri_tools_pkg_version: 1.24.2-00 kubernetes_container_runtime: containerd kubernetes_network_plugin: kubeguard @@ -28,17 +28,16 @@ kubeguard: ## 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: - emc-01: 1 - emc-02: 2 - emc-03: 3 - emc-04: 4 - emc-05: 5 - emc-06: 6 - emc-00: 100 - emc-dist0: 110 + ele-emc-e01: 1 + ele-emc-e02: 2 + ele-emc-e03: 3 + ele-emc-e04: 4 + ele-emc-e05: 5 + ele-emc-e06: 6 + ele-emc-r0: 100 ele-telesto: 111 ele-dione: 112 - emc-ctrl: 127 + ele-emc-ctrl: 127 direct_net_zones: encoder: diff --git a/inventory/group_vars/vmhost-sk-2019vm/vars.yml b/inventory/group_vars/vmhost-sk-2019vm/vars.yml index 41f8b9db..7c0559dd 100644 --- a/inventory/group_vars/vmhost-sk-2019vm/vars.yml +++ b/inventory/group_vars/vmhost-sk-2019vm/vars.yml @@ -11,7 +11,7 @@ vm_host: prefix: 192.168.250.0/24 offsets: sk-torrent: 136 - emc-ctrl: 137 + ele-emc-ctrl: 137 ele-gwhetzner: 138 sgg-icecast: 141 ch-mimas: 142 @@ -23,7 +23,7 @@ vm_host: prefix: 178.63.180.136/29 offsets: sk-torrent: 0 - emc-ctrl: 1 + ele-emc-ctrl: 1 ele-gwhetzner: 2 sgg-icecast: 5 ch-mimas: 6 diff --git a/inventory/host_vars/emc-ctrl.yml b/inventory/host_vars/ele-emc-ctrl.yml index f926c7d2..f926c7d2 100644 --- a/inventory/host_vars/emc-ctrl.yml +++ b/inventory/host_vars/ele-emc-ctrl.yml diff --git a/inventory/hosts.ini b/inventory/hosts.ini index b43eb755..9f1ad97f 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -68,10 +68,8 @@ chaos-at-home-ups mz-router ansible_host=chmz-router mz-ap ansible_host=chmz-ap - [chaos-at-home-switches:vars] ansible_port=22 - [chaos-at-home-switches] ch-sw0 host_name=sw0 ansible_host=192.168.42.200 ch-sw1 host_name=sw1 ansible_host=192.168.42.201 @@ -183,34 +181,6 @@ sk-testvm host_name=testvm sk-torrent host_name=torrent -[ele-ap] -# ele-ap-forum[0:3] -# ele-ap-parkhouse0 -# ele-ap-orpheum0 -# ele-ap-uhrturm0 -# ele-ap-nextlib[0:6] -ele-ap-hmtsaal[0:3] -ele-ap-leslie[0:1] - -[ele-ups] -# ele-ups-forum[0:1] -# ele-ups-uhrturm0 -# ele-ups-parkhouse0 -# ele-ups-nextlib[0:3] -ele-ups-hmtsaal[0:2] -ele-ups-leslie0 - - -[ele-dolmetsch-raspi] -ele-dol-raspi0 -ele-dol-raspi1 - -[ele-infobeamer] -ele-infobeamer-emc -ele-infobeamer-orpheum -ele-infobeamer-dom -ele-infobeamer-default - [elevate:vars] host_domain=elevate.at env_group=dan @@ -248,25 +218,51 @@ ele-ups ele-dolmetsch-raspi ele-infobeamer +[ele-ap] +# ele-ap-forum[0:3] +# ele-ap-parkhouse0 +# ele-ap-orpheum0 +# ele-ap-uhrturm0 +# ele-ap-nextlib[0:6] +ele-ap-hmtsaal[0:3] +ele-ap-leslie[0:1] + +[ele-ups] +# ele-ups-forum[0:1] +# ele-ups-uhrturm0 +# ele-ups-parkhouse0 +# ele-ups-nextlib[0:3] +ele-ups-hmtsaal[0:2] +ele-ups-leslie0 + +[ele-dolmetsch-raspi] +ele-dol-raspi0 +ele-dol-raspi1 -[emc:vars] +[ele-infobeamer] +ele-infobeamer-emc +ele-infobeamer-orpheum +ele-infobeamer-dom +ele-infobeamer-default + + +[elevate-mediachannel:vars] host_domain=elev8.at env_group=dan -[emc] -emc-ctrl - -[emc:children] -emc-dist -emc-xx -#emc-todelete +[elevate-mediachannel] +ele-emc-ctrl host_name=emc-ctrl +[elevate-mediachannel:children] +elevate-mediachannel-relay +elevate-mediachannel-edge -[emc-dist] -emc-dist0 +[elevate-mediachannel-relay] +ele-emc-r0 host_name=emc-r0 -[emc-xx] -emc-00 -emc-0[1:3] +[elevate-mediachannel-edge] +ele-emc-e01 host_name=emc-e01 +ele-emc-e02 host_name=emc-e02 +#ele-emc-e03 host_name=emc-e03 ############################### @@ -375,7 +371,7 @@ sk-testvm sk-torrent ch-mimas ele-gwhetzner -emc-ctrl +ele-emc-ctrl sgg-icecast [vmhost-sk-2019vm] sk-2019vm @@ -447,7 +443,7 @@ ele-telesto #ele-ap #ele-ups promzone-elevate-festival-server -#emc +#elevate-mediachannel ## openvpn @@ -479,11 +475,11 @@ glt-meet2 glt-stream [hcloud:children] -emc-dist -emc-xx +elevate-mediachannel-relay +elevate-mediachannel-edge [hetzner] -emc-ctrl +ele-emc-ctrl sk-testvm sk-torrent sgg-icecast @@ -516,7 +512,7 @@ ele-dolmetsch-raspi [elevate-festival:children] elevate -k8s-emc +elevate-mediachannel @@ -555,34 +551,18 @@ standalone-kubelet ### Kubernetes Cluster: emc -[k8s-emc-encoder] +[k8s-emc] +ele-emc-ctrl ele-telesto ele-dione -[k8s-emc-distribution:children] -emc-dist - -[k8s-emc-streamer:children] -emc-xx - -[k8s-emc-ctrl] -emc-ctrl - [k8s-emc:children] -k8s-emc-ctrl -k8s-emc-encoder -k8s-emc-distribution -k8s-emc-streamer +elevate-mediachannel-relay +elevate-mediachannel-edge ### Kubernetes Cluster: chtest -[k8s-chtest-encoder] +[k8s-chtest] +ch-k8s-ctrl ch-dione ch-helene - -[k8s-chtest-ctrl] -ch-k8s-ctrl - -[k8s-chtest:children] -k8s-chtest-ctrl -k8s-chtest-encoder |