Skip to content

Commit ec2c137

Browse files
committed
Merge branch 'rework-post-kubernetes' of github.com:SovereignCloudStack/hardware-landscape into rework-post-kubernetes
2 parents ab479b7 + ea6eff1 commit ec2c137

File tree

14 files changed

+494
-509
lines changed

14 files changed

+494
-509
lines changed

documentation/System_Runbooks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
echo "${VPN_KEYDIR?}"
2727
cat ${VPN_KEYDIR?}/wireguard_public.key
2828
```
29-
* User: Edit [../inventory/group_vars/all.yml](../inventory/group_vars/all.yml) in section ``wireguard_users``
29+
* User: Edit [../inventory/group_vars/wireguard.yml](../inventory/group_vars/wireguard.yml) in section ``wireguard_users``
3030
* Add username (same as github handle)
3131
* Add public key to user entry
3232
* Remove outdated users

documentation/System_Usage.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ of your local system to simplify access to systems of the vp18 hardware landscap
1414
* Add this snippet to your SSH configuration:
1515
```
1616
cat >> ~/.ssh/config <<EOF
17-
Include ${SCS_ENV_DIR:?}/hardware-landscape/config-snippets/ssh_config_scs_servers
18-
Include ${SCS_ENV_DIR:?}/hardware-landscape/config-snippets/ssh_config_scs_switches
19-
Include ${SCS_ENV_DIR:?}/hardware-landscape/config-snippets/ssh_config_scs_general
17+
Include ${SCS_ENV_DIR:?}/config-snippets/ssh_config_scs_servers
18+
Include ${SCS_ENV_DIR:?}/config-snippets/ssh_config_scs_switches
19+
Include ${SCS_ENV_DIR:?}/config-snippets/ssh_config_scs_general
2020
2121
Host scs-node-*
2222
ProxyJump scs-manager

environments/custom/playbook-lvm.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# https://docs.debops.org/en/stable-3.1/ansible/roles/lvm/defaults/main.html#volume-groups-and-logical-volumes
2+
- name: Manage LVM volumes
3+
hosts: generic
4+
gather_facts: yes
5+
become: true
6+
tasks:
7+
- name: Manage LVM Logical Volumes
8+
community.general.lvol:
9+
lv: '{{ item.lv }}'
10+
vg: '{{ item.vg }}'
11+
size: '{{ item.size }}'
12+
force: '{{ item.force | d(omit) }}'
13+
state: 'present'
14+
with_items: '{{ logical_volumes }}'

environments/custom/playbook-scs_all_nodes.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@
44
become: true
55
roles:
66
- scs-landscape-nodes
7+
- debops.lvm

environments/custom/roles/scs-landscape-nodes/files/scripts/scs_profile.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,6 @@ if [ -d /opt/configuration ];then
8080
cd /opt/configuration
8181
fi
8282

83+
alias df='df -h -x squashfs -x tmpfs -x devtmpfs -x overlay'
84+
8385
export PATH="/usr/local/scripts:$PATH"

environments/secrets.yml

Lines changed: 444 additions & 431 deletions
Large diffs are not rendered by default.

inventory/group_vars/control.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,16 @@ chrony_allowed_subnets:
2121
# strictly in a client-only mode.
2222
chrony_bind_local_interfaces_only: false
2323

24+
25+
logical_volumes:
26+
- lv: 'log'
27+
vg: 'system'
28+
size: '30G'
29+
resizefs: true
30+
force: true
31+
- lv: 'docker'
32+
vg: 'system'
33+
size: '100G'
34+
resizefs: true
35+
force: true
36+
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
logical_volumes: []

inventory/group_vars/generic/ceph.yml

Lines changed: 0 additions & 25 deletions
This file was deleted.

inventory/group_vars/generic/chrony.yml

Lines changed: 0 additions & 25 deletions
This file was deleted.

inventory/group_vars/generic/dhcpd.yml

Lines changed: 0 additions & 12 deletions
This file was deleted.

inventory/group_vars/generic/motd.yml

Lines changed: 0 additions & 10 deletions
This file was deleted.

inventory/group_vars/manager.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,15 @@ tinyproxy_allowed_networks:
3737
# - ^.*debian.*$
3838
# - ^.*ubuntu.*$
3939

40+
41+
logical_volumes:
42+
- lv: 'log'
43+
vg: 'system'
44+
size: '30G'
45+
resizefs: true
46+
force: true
47+
- lv: 'docker'
48+
vg: 'system'
49+
size: '100G'
50+
resizefs: true
51+
force: true

inventory/group_vars/wireguard.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@ wireguard_users:
1111
- name: scoopex
1212
key: 3XfXCmSo5+2kCrUgI/OmQDxSrx3gnomvFESNUhXVflw=
1313
ip: 10.10.1.20
14-
15-
14+
- name: matofeder
15+
key: EkL7bli2t4EJSDYo4Edyhg8enHI1zOR+A54Ghco1OlY=
16+
ip: 10.10.1.21

0 commit comments

Comments
 (0)