From c09b07327b688a6a47f523a15c1a5c29d4f476d0 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sat, 7 May 2022 22:45:49 +0200
Subject: k8s: rename masters to control-plane nodes

---
 inventory/host_vars/ch-dione.yml      | 33 ++++++++------
 inventory/host_vars/ch-helene.yml     | 33 ++++++++------
 inventory/host_vars/ch-k8s-ctrl.yml   | 72 +++++++++++++++++++++++++++++
 inventory/host_vars/ch-k8s-master.yml | 72 -----------------------------
 inventory/host_vars/emc-ctrl.yml      | 86 +++++++++++++++++++++++++++++++++++
 inventory/host_vars/emc-master.yml    | 86 -----------------------------------
 6 files changed, 198 insertions(+), 184 deletions(-)
 create mode 100644 inventory/host_vars/ch-k8s-ctrl.yml
 delete mode 100644 inventory/host_vars/ch-k8s-master.yml
 create mode 100644 inventory/host_vars/emc-ctrl.yml
 delete mode 100644 inventory/host_vars/emc-master.yml

(limited to 'inventory/host_vars')

diff --git a/inventory/host_vars/ch-dione.yml b/inventory/host_vars/ch-dione.yml
index a3cbbe68..ef9d8657 100644
--- a/inventory/host_vars/ch-dione.yml
+++ b/inventory/host_vars/ch-dione.yml
@@ -48,11 +48,18 @@ blackmagic_desktopvideo_version: 12.2.2a6
 blackmagic_desktopvideo_include_gui: yes
 
 
-docker_pkg_provider: docker-com
-docker_storage:
+# docker_pkg_provider: docker-com
+# docker_storage:
+#   type: lvm
+#   vg: "{{ host_name }}"
+#   lv: docker
+#   size: 10G
+#   fs: ext4
+
+containerd_storage:
   type: lvm
   vg: "{{ host_name }}"
-  lv: docker
+  lv: containerd
   size: 10G
   fs: ext4
 
@@ -63,15 +70,15 @@ kubelet_storage:
   size: 5G
   fs: ext4
 
-kubernetes_version: 1.24.0
-kubernetes_container_runtime: docker
-kubernetes_standalone_max_pods: 42
-kubernetes_standalone_cni_variant: with-portmap
+# kubernetes_version: 1.24.0
+# kubernetes_container_runtime: docker
+# kubernetes_standalone_max_pods: 42
+# kubernetes_standalone_cni_variant: with-portmap
 
 
-rtmp_streamer_base_path: /srv/storage/streamer
-rtmp_streamer_inst_name: feed
-rtmp_streamer_nginx_image_version: 2022-04-29.23
-rtmp_streamer_decklink_card: "DeckLink 8K Pro (1)"
-rtmp_streamer_config:
-  input_params: ['-f', 'decklink', '-video_input', 'sdi', '-format_code', 'Hp50', '-ac', '2', '-i']
+# rtmp_streamer_base_path: /srv/storage/streamer
+# rtmp_streamer_inst_name: feed
+# rtmp_streamer_nginx_image_version: 2022-04-29.23
+# rtmp_streamer_decklink_card: "DeckLink 8K Pro (1)"
+# rtmp_streamer_config:
+#   input_params: ['-f', 'decklink', '-video_input', 'sdi', '-format_code', 'Hp50', '-ac', '2', '-i']
diff --git a/inventory/host_vars/ch-helene.yml b/inventory/host_vars/ch-helene.yml
index c524bf6a..816b38f8 100644
--- a/inventory/host_vars/ch-helene.yml
+++ b/inventory/host_vars/ch-helene.yml
@@ -48,11 +48,18 @@ blackmagic_desktopvideo_version: 12.2.2a6
 blackmagic_desktopvideo_include_gui: yes
 
 
-docker_pkg_provider: docker-com
-docker_storage:
+# docker_pkg_provider: docker-com
+# docker_storage:
+#   type: lvm
+#   vg: "{{ host_name }}"
+#   lv: docker
+#   size: 10G
+#   fs: ext4
+
+containerd_storage:
   type: lvm
   vg: "{{ host_name }}"
-  lv: docker
+  lv: containerd
   size: 10G
   fs: ext4
 
@@ -63,15 +70,15 @@ kubelet_storage:
   size: 5G
   fs: ext4
 
-kubernetes_version: 1.24.0
-kubernetes_container_runtime: docker
-kubernetes_standalone_max_pods: 42
-kubernetes_standalone_cni_variant: with-portmap
+# kubernetes_version: 1.24.0
+# kubernetes_container_runtime: docker
+# kubernetes_standalone_max_pods: 42
+# kubernetes_standalone_cni_variant: with-portmap
 
 
-rtmp_streamer_base_path: /srv/storage/streamer
-rtmp_streamer_inst_name: feed
-rtmp_streamer_nginx_image_version: 2022-04-29.23
-rtmp_streamer_decklink_card: "DeckLink SDI 4K"
-rtmp_streamer_config:
-  input_params: ['-f', 'decklink', '-video_input', 'sdi', '-format_code', 'Hp50', '-ac', '2', '-i']
+# rtmp_streamer_base_path: /srv/storage/streamer
+# rtmp_streamer_inst_name: feed
+# rtmp_streamer_nginx_image_version: 2022-04-29.23
+# rtmp_streamer_decklink_card: "DeckLink SDI 4K"
+# rtmp_streamer_config:
+#   input_params: ['-f', 'decklink', '-video_input', 'sdi', '-format_code', 'Hp50', '-ac', '2', '-i']
diff --git a/inventory/host_vars/ch-k8s-ctrl.yml b/inventory/host_vars/ch-k8s-ctrl.yml
new file mode 100644
index 00000000..63723000
--- /dev/null
+++ b/inventory/host_vars/ch-k8s-ctrl.yml
@@ -0,0 +1,72 @@
+---
+install_jumphost: ch-jump
+
+install:
+  vm:
+    memory: 4G
+    numcpus: 4
+    autostart: True
+  disks:
+    primary: /dev/sda
+    scsi:
+      sda:
+        type: zfs
+        name: root
+        size: 20g
+        properties:
+          'syncoid:sync': 'false'
+  system_lvm:
+    volumes:
+    - name: root
+      size: 3G
+      filesystem: ext4
+      mountpoint: /
+    - name: var
+      size: 1280M
+      filesystem: ext4
+      mountpoint: /var
+    - name: var+log
+      size: 768M
+      filesystem: ext4
+      mountpoint: /var/log
+      mount_options:
+      - noatime
+      - nodev
+      - noexec
+  interfaces:
+  - bridge: br-svc
+    name: svc0
+
+network:
+  nameservers: "{{ network_zones.svc.dns }}"
+  domain: "{{ host_domain }}"
+  systemd_link:
+    interfaces: "{{ install.interfaces }}"
+  primary: &_network_primary_
+    name: svc0
+    address: "{{ network_zones.svc.prefix | ipaddr(network_zones.svc.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
+    gateway: "{{ network_zones.svc.gateway }}"
+    static_routes:
+    - destination: "{{ network_zones.lan.prefix }}"
+      gateway: "{{ network_zones.svc.prefix | ipaddr(network_zones.svc.offsets['ch-gw-lan']) | ipaddr('address') }}"
+  interfaces:
+  - *_network_primary_
+
+
+spreadspace_apt_repo_components:
+  - container
+
+
+containerd_storage:
+  type: lvm
+  vg: "{{ host_name }}"
+  lv: containerd
+  size: 7G
+  fs: ext4
+
+kubelet_storage:
+  type: lvm
+  vg: "{{ host_name }}"
+  lv: kubelet
+  size: 5G
+  fs: ext4
diff --git a/inventory/host_vars/ch-k8s-master.yml b/inventory/host_vars/ch-k8s-master.yml
deleted file mode 100644
index 63723000..00000000
--- a/inventory/host_vars/ch-k8s-master.yml
+++ /dev/null
@@ -1,72 +0,0 @@
----
-install_jumphost: ch-jump
-
-install:
-  vm:
-    memory: 4G
-    numcpus: 4
-    autostart: True
-  disks:
-    primary: /dev/sda
-    scsi:
-      sda:
-        type: zfs
-        name: root
-        size: 20g
-        properties:
-          'syncoid:sync': 'false'
-  system_lvm:
-    volumes:
-    - name: root
-      size: 3G
-      filesystem: ext4
-      mountpoint: /
-    - name: var
-      size: 1280M
-      filesystem: ext4
-      mountpoint: /var
-    - name: var+log
-      size: 768M
-      filesystem: ext4
-      mountpoint: /var/log
-      mount_options:
-      - noatime
-      - nodev
-      - noexec
-  interfaces:
-  - bridge: br-svc
-    name: svc0
-
-network:
-  nameservers: "{{ network_zones.svc.dns }}"
-  domain: "{{ host_domain }}"
-  systemd_link:
-    interfaces: "{{ install.interfaces }}"
-  primary: &_network_primary_
-    name: svc0
-    address: "{{ network_zones.svc.prefix | ipaddr(network_zones.svc.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
-    gateway: "{{ network_zones.svc.gateway }}"
-    static_routes:
-    - destination: "{{ network_zones.lan.prefix }}"
-      gateway: "{{ network_zones.svc.prefix | ipaddr(network_zones.svc.offsets['ch-gw-lan']) | ipaddr('address') }}"
-  interfaces:
-  - *_network_primary_
-
-
-spreadspace_apt_repo_components:
-  - container
-
-
-containerd_storage:
-  type: lvm
-  vg: "{{ host_name }}"
-  lv: containerd
-  size: 7G
-  fs: ext4
-
-kubelet_storage:
-  type: lvm
-  vg: "{{ host_name }}"
-  lv: kubelet
-  size: 5G
-  fs: ext4
diff --git a/inventory/host_vars/emc-ctrl.yml b/inventory/host_vars/emc-ctrl.yml
new file mode 100644
index 00000000..1ca011ec
--- /dev/null
+++ b/inventory/host_vars/emc-ctrl.yml
@@ -0,0 +1,86 @@
+---
+install:
+  vm:
+    memory: 10G
+    numcpus: 6
+    autostart: True
+  disks:
+    primary: /dev/sda
+    scsi:
+      sda:
+        type: zfs
+        name: root
+        size: 20g
+      sdb:
+        type: blockdev
+        path: /dev/zvol/storage/streamstats
+  system_lvm:
+    volumes:
+    - name: root
+      size: 3G
+      filesystem: ext4
+      mountpoint: /
+    - name: var
+      size: 1280M
+      filesystem: ext4
+      mountpoint: /var
+    - name: var+log
+      size: 768M
+      filesystem: ext4
+      mountpoint: /var/log
+      mount_options:
+      - noatime
+      - nodev
+      - noexec
+  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') }}"
+    template: overlay
+    overlay: "{{ (vm_host.network.bridges.public.overlays.default.prefix | ipaddr(vm_host.network.bridges.public.overlays.default.offsets[inventory_hostname])).split('/')[0] }}"
+  interfaces:
+  - *_network_primary_
+
+external_ip: "{{ network.primary.overlay }}"
+
+
+spreadspace_apt_repo_components:
+  - prometheus
+  - container
+
+
+containerd_storage:
+  type: lvm
+  vg: "{{ host_name }}"
+  lv: containerd
+  size: 7G
+  fs: ext4
+
+kubelet_storage:
+  type: lvm
+  vg: "{{ host_name }}"
+  lv: kubelet
+  size: 5G
+  fs: ext4
+
+
+lvm_groups:
+  streamstats:
+    pvs:
+    - /dev/sdb
+
+emc_stats_storage:
+  type: lvm
+  vg: streamstats
+  lv: stats
+  size: 42G
+  fs: ext4
diff --git a/inventory/host_vars/emc-master.yml b/inventory/host_vars/emc-master.yml
deleted file mode 100644
index 1ca011ec..00000000
--- a/inventory/host_vars/emc-master.yml
+++ /dev/null
@@ -1,86 +0,0 @@
----
-install:
-  vm:
-    memory: 10G
-    numcpus: 6
-    autostart: True
-  disks:
-    primary: /dev/sda
-    scsi:
-      sda:
-        type: zfs
-        name: root
-        size: 20g
-      sdb:
-        type: blockdev
-        path: /dev/zvol/storage/streamstats
-  system_lvm:
-    volumes:
-    - name: root
-      size: 3G
-      filesystem: ext4
-      mountpoint: /
-    - name: var
-      size: 1280M
-      filesystem: ext4
-      mountpoint: /var
-    - name: var+log
-      size: 768M
-      filesystem: ext4
-      mountpoint: /var/log
-      mount_options:
-      - noatime
-      - nodev
-      - noexec
-  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') }}"
-    template: overlay
-    overlay: "{{ (vm_host.network.bridges.public.overlays.default.prefix | ipaddr(vm_host.network.bridges.public.overlays.default.offsets[inventory_hostname])).split('/')[0] }}"
-  interfaces:
-  - *_network_primary_
-
-external_ip: "{{ network.primary.overlay }}"
-
-
-spreadspace_apt_repo_components:
-  - prometheus
-  - container
-
-
-containerd_storage:
-  type: lvm
-  vg: "{{ host_name }}"
-  lv: containerd
-  size: 7G
-  fs: ext4
-
-kubelet_storage:
-  type: lvm
-  vg: "{{ host_name }}"
-  lv: kubelet
-  size: 5G
-  fs: ext4
-
-
-lvm_groups:
-  streamstats:
-    pvs:
-    - /dev/sdb
-
-emc_stats_storage:
-  type: lvm
-  vg: streamstats
-  lv: stats
-  size: 42G
-  fs: ext4
-- 
cgit v1.2.3