Merge branch 'rework-post-kubernetes' of github.com:SovereignCloudSta…

…ck/hardware-landscape into rework-post-kubernetes
SovereignCloudStack · Jul 7, 2024 · ec2c137 · ec2c137
2 parents ab479b7 + ea6eff1
commit ec2c137
Show file tree

Hide file tree

Showing 14 changed files with 494 additions and 509 deletions.
diff --git a/documentation/System_Runbooks.md b/documentation/System_Runbooks.md
@@ -26,7 +26,7 @@
   echo "${VPN_KEYDIR?}"
   cat ${VPN_KEYDIR?}/wireguard_public.key
   ```
-* User: Edit [../inventory/group_vars/all.yml](../inventory/group_vars/all.yml) in section ``wireguard_users``
+* User: Edit [../inventory/group_vars/wireguard.yml](../inventory/group_vars/wireguard.yml) in section ``wireguard_users``
   * Add username (same as github handle)
   * Add public key to user entry
   * Remove outdated users

diff --git a/documentation/System_Usage.md b/documentation/System_Usage.md
@@ -14,9 +14,9 @@ of your local system to simplify access to systems of the vp18 hardware landscap
 * Add this snippet to your SSH configuration:
   ```
   cat >> ~/.ssh/config <<EOF
-  Include ${SCS_ENV_DIR:?}/hardware-landscape/config-snippets/ssh_config_scs_servers
-  Include ${SCS_ENV_DIR:?}/hardware-landscape/config-snippets/ssh_config_scs_switches
-  Include ${SCS_ENV_DIR:?}/hardware-landscape/config-snippets/ssh_config_scs_general
+  Include ${SCS_ENV_DIR:?}/config-snippets/ssh_config_scs_servers
+  Include ${SCS_ENV_DIR:?}/config-snippets/ssh_config_scs_switches
+  Include ${SCS_ENV_DIR:?}/config-snippets/ssh_config_scs_general
 
   Host scs-node-*
       ProxyJump scs-manager

diff --git a/environments/custom/playbook-lvm.yml b/environments/custom/playbook-lvm.yml
@@ -0,0 +1,14 @@
+# https://docs.debops.org/en/stable-3.1/ansible/roles/lvm/defaults/main.html#volume-groups-and-logical-volumes
+- name: Manage LVM volumes
+  hosts: generic
+  gather_facts: yes
+  become: true
+  tasks:
+    - name: Manage LVM Logical Volumes
+      community.general.lvol:
+        lv:         '{{ item.lv }}'
+        vg:         '{{ item.vg }}'
+        size:       '{{ item.size }}'
+        force:      '{{ item.force | d(omit) }}'
+        state:      'present'
+      with_items: '{{ logical_volumes }}'
diff --git a/environments/custom/playbook-scs_all_nodes.yml b/environments/custom/playbook-scs_all_nodes.yml
@@ -4,3 +4,4 @@
   become: true
   roles:
     - scs-landscape-nodes
+    - debops.lvm
diff --git a/environments/custom/roles/scs-landscape-nodes/files/scripts/scs_profile.sh b/environments/custom/roles/scs-landscape-nodes/files/scripts/scs_profile.sh
@@ -80,4 +80,6 @@ if [ -d /opt/configuration ];then
    cd /opt/configuration
 fi
 
+alias df='df -h -x squashfs -x tmpfs -x devtmpfs -x overlay'
+
 export PATH="/usr/local/scripts:$PATH"
diff --git a/environments/secrets.yml b/environments/secrets.yml
diff --git a/inventory/group_vars/control.yml b/inventory/group_vars/control.yml
@@ -21,3 +21,16 @@ chrony_allowed_subnets:
 # strictly in a client-only mode.
 chrony_bind_local_interfaces_only: false
 
+
+logical_volumes:
+  - lv: 'log'
+    vg: 'system'
+    size: '30G'
+    resizefs: true
+    force: true
+  - lv: 'docker'
+    vg: 'system'
+    size: '100G'
+    resizefs: true
+    force: true
+
diff --git a/inventory/group_vars/generic/15_lvm.yml b/inventory/group_vars/generic/15_lvm.yml
@@ -0,0 +1 @@
+logical_volumes: []
diff --git a/inventory/group_vars/generic/ceph.yml b/inventory/group_vars/generic/ceph.yml
diff --git a/inventory/group_vars/generic/chrony.yml b/inventory/group_vars/generic/chrony.yml
diff --git a/inventory/group_vars/generic/dhcpd.yml b/inventory/group_vars/generic/dhcpd.yml
diff --git a/inventory/group_vars/generic/motd.yml b/inventory/group_vars/generic/motd.yml
diff --git a/inventory/group_vars/manager.yml b/inventory/group_vars/manager.yml
@@ -37,3 +37,15 @@ tinyproxy_allowed_networks:
 #  - ^.*debian.*$
 #  - ^.*ubuntu.*$
 
+
+logical_volumes:
+  - lv: 'log'
+    vg: 'system'
+    size: '30G'
+    resizefs: true
+    force: true
+  - lv: 'docker'
+    vg: 'system'
+    size: '100G'
+    resizefs: true
+    force: true
diff --git a/inventory/group_vars/wireguard.yml b/inventory/group_vars/wireguard.yml
@@ -11,5 +11,6 @@ wireguard_users:
   - name: scoopex
     key: 3XfXCmSo5+2kCrUgI/OmQDxSrx3gnomvFESNUhXVflw=
     ip: 10.10.1.20
-
-
+  - name: matofeder
+    key: EkL7bli2t4EJSDYo4Edyhg8enHI1zOR+A54Ghco1OlY=
+    ip: 10.10.1.21