From dd2c27011ffc6aad65e40b8fe67c0ec85984cb75 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Wed, 19 Aug 2020 22:51:42 +0200 Subject: thetys: harmonize deployment --- dan/ele-thetys.yml | 2 +- inventory/host_vars/ele-thetys.yml | 7 ++++++- inventory/host_vars/lw-thetys.yml | 7 ++++++- inventory/host_vars/s2-thetys.yml | 24 +++++++++++++++++++++++- inventory/hosts.ini | 1 + spreadspace/lw-thetys.yml | 2 +- spreadspace/s2-thetys.yml | 2 ++ 7 files changed, 40 insertions(+), 5 deletions(-) diff --git a/dan/ele-thetys.yml b/dan/ele-thetys.yml index 66ca1d76..f79571a7 100644 --- a/dan/ele-thetys.yml +++ b/dan/ele-thetys.yml @@ -8,7 +8,7 @@ - role: core/zsh - role: core/cpu-microcode - role: core/admin-users - - role: blackmagic-desktopvideo - role: apt-repo/spreadspace + - role: blackmagic-desktopvideo - role: kubernetes/base - role: kubernetes/standalone/base diff --git a/inventory/host_vars/ele-thetys.yml b/inventory/host_vars/ele-thetys.yml index 2d6bee1d..69bdec2b 100644 --- a/inventory/host_vars/ele-thetys.yml +++ b/inventory/host_vars/ele-thetys.yml @@ -19,6 +19,11 @@ network: admin_users_host: - equinox +apt_repo_components: + - main + - contrib + - non-free ## for microcode updates + docker_pkg_provider: docker-com docker_pkg_name: docker-ce @@ -34,7 +39,7 @@ kubelet_lvm: size: 5G fs: ext4 -kubernetes_version: 1.17.2 +kubernetes_version: 1.18.8 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 42 kubernetes_standalone_cni_variant: with-portmap diff --git a/inventory/host_vars/lw-thetys.yml b/inventory/host_vars/lw-thetys.yml index 17b057b2..77aee114 100644 --- a/inventory/host_vars/lw-thetys.yml +++ b/inventory/host_vars/lw-thetys.yml @@ -20,6 +20,11 @@ network: admin_users_host: - equinox +apt_repo_components: + - main + - contrib + - non-free ## for microcode updates + docker_pkg_provider: docker-com docker_pkg_name: docker-ce @@ -35,7 +40,7 @@ kubelet_lvm: size: 5G fs: ext4 -kubernetes_version: 1.17.5 +kubernetes_version: 1.18.8 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 42 kubernetes_standalone_cni_variant: with-portmap diff --git a/inventory/host_vars/s2-thetys.yml b/inventory/host_vars/s2-thetys.yml index ab4ee8ed..38909332 100644 --- a/inventory/host_vars/s2-thetys.yml +++ b/inventory/host_vars/s2-thetys.yml @@ -8,7 +8,9 @@ install: network: nameservers: - - 9.9.9.9 +# - 9.9.9.9 + - 195.58.160.194 + - 195.58.161.122 domain: "{{ host_domain }}" primary: &_network_primary_ name: eno1 @@ -24,3 +26,23 @@ apt_repo_components: - main - contrib - non-free ## for microcode updates + +docker_pkg_provider: docker-com +docker_pkg_name: docker-ce + +docker_lvm: + vg: "{{ host_name }}" + lv: docker + size: 10G + fs: ext4 + +kubelet_lvm: + vg: "{{ host_name }}" + lv: kubelet + size: 5G + fs: ext4 + +kubernetes_version: 1.18.8 +kubernetes_container_runtime: docker +kubernetes_standalone_max_pods: 42 +kubernetes_standalone_cni_variant: with-portmap diff --git a/inventory/hosts.ini b/inventory/hosts.ini index 686c4736..0e1431bf 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -383,6 +383,7 @@ sk-cloudia sk-cloudio ele-thetys lw-thetys +s2-thetys sk-tomnext-nc [kubernetes:children] diff --git a/spreadspace/lw-thetys.yml b/spreadspace/lw-thetys.yml index 3c177627..21c98c95 100644 --- a/spreadspace/lw-thetys.yml +++ b/spreadspace/lw-thetys.yml @@ -8,8 +8,8 @@ - role: core/zsh - role: core/cpu-microcode - role: core/admin-users - - role: blackmagic-desktopvideo - role: apt-repo/spreadspace + - role: blackmagic-desktopvideo - role: kubernetes/base - role: kubernetes/standalone/base - role: wireguard/base diff --git a/spreadspace/s2-thetys.yml b/spreadspace/s2-thetys.yml index 780f8f0f..1ad4da1d 100644 --- a/spreadspace/s2-thetys.yml +++ b/spreadspace/s2-thetys.yml @@ -10,3 +10,5 @@ - role: core/admin-users - role: apt-repo/spreadspace - role: blackmagic-desktopvideo + - role: kubernetes/base + - role: kubernetes/standalone/base -- cgit v1.2.3