Merge branch 'main' into improve_yaml

scoopex · web-flow · commit 1155035b6ef1 · 2024-07-08T11:58:02.000+02:00
diff --git a/environments/custom/playbook-scs_all_nodes.yml b/environments/custom/playbook-scs_all_nodes.yml
@@ -1,6 +1,7 @@
 ---
 - name: Assign roles to all hosts
   hosts: generic
-  become: true
+  become: yes
+  gather_facts: no
   roles:
     - scs-landscape-nodes
diff --git a/environments/custom/roles/scs-landscape-nodes/defaults/main.yml b/environments/custom/roles/scs-landscape-nodes/defaults/main.yml
@@ -1,2 +1,3 @@
 ---
 # defaults file for scs-landscape
+logical_volumes: []
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/custom/roles/scs-landscape-nodes/tasks/lvm.yml b/environments/custom/roles/scs-landscape-nodes/tasks/lvm.yml
@@ -0,0 +1,12 @@
+# https://docs.debops.org/en/stable-3.1/ansible/roles/lvm/defaults/main.html#volume-groups-and-logical-volumes
+- name: Manage LVM Logical Volumes
+  community.general.lvol:
+    lv: '{{ lv_item.lv }}'
+    vg: '{{ lv_item.vg }}'
+    size: '{{ lv_item.size }}'
+    force: '{{ lv_item.force | d(omit) }}'
+    state: 'present'
+  loop: '{{ logical_volumes }}'
+  loop_control:
+    loop_var: lv_item
+  tags: manage_lvm
diff --git a/environments/custom/roles/scs-landscape-nodes/tasks/main.yml b/environments/custom/roles/scs-landscape-nodes/tasks/main.yml
@@ -1,7 +1,9 @@
-- name: Setup Manager
+- name: Setup Node
   include_tasks: "{{ item }}"
   loop:
+    - lvm.yml
     - scripts.yml
     - vim.yml
     - packages.yml
+  tags: manage_lvm
 
diff --git a/environments/custom/roles/scs-landscape-nodes/tasks/scripts.yml b/environments/custom/roles/scs-landscape-nodes/tasks/scripts.yml
@@ -1,9 +1,3 @@
-- name: Remove ceph wrapper
-  become: yes
-  file:
-    path: /usr/local/bin/ceph
-    state: absent
-
 - name: Synchronize all scs helper scripts
   become: yes
   tags: scripts
diff --git a/environments/manager/configuration.yml b/environments/manager/configuration.yml
@@ -64,4 +64,4 @@ configuration_git_protocol: ssh
 configuration_git_repository: SovereignCloudStack/hardware-landscape
 configuration_git_username: git
 
-configuration_git_version: rework-post7-0-5
+configuration_git_version: rework-post-kubernetes
diff --git a/inventory/group_vars/control.yml b/inventory/group_vars/control.yml
@@ -21,3 +21,14 @@ 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/manager.yml b/inventory/group_vars/manager.yml
@@ -37,3 +37,14 @@ 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/host_vars/st01-mgmt-r01-u31/02_chrony.yml b/inventory/host_vars/st01-mgmt-r01-u31/02_chrony.yml
@@ -1,2 +1,2 @@
-
+---
 chrony_bindaddresses: [ "{{ internal_address }}" ]
diff --git a/inventory/host_vars/st01-sw100g-r01-u36/01_base.yml b/inventory/host_vars/st01-sw100g-r01-u36/01_base.yml
@@ -11,4 +11,5 @@ device_model: 7726-32X-O-AC-B
 mgmt_mac: 90:2d:77:58:27:50
 mgmt_address: 10.10.23.110
 serial_device: BCBRb113318
-bgp_asn: 65501
+bgp_asn: 65501
+
diff --git a/inventory/host_vars/st01-sw100g-r01-u37/01_base.yml b/inventory/host_vars/st01-sw100g-r01-u37/01_base.yml
@@ -11,4 +11,5 @@ device_model: 7726-32X-O-AC-B
 mgmt_mac: 90:2d:77:58:26:50
 mgmt_address: 10.10.23.109
 serial_device: DEABb113318
-bgp_asn: 65501
+bgp_asn: 65501
+
diff --git a/inventory/host_vars/st01-sw25g-r01-u34/01_base.yml b/inventory/host_vars/st01-sw25g-r01-u34/01_base.yml
@@ -11,4 +11,5 @@ device_model: 7326-56X-O-AC-B
 mgmt_mac: d0:77:ce:4b:b4:7a
 mgmt_address: 10.10.23.107
 serial_device: CGBSb113318
-bgp_asn: 65504
+bgp_asn: 65504
+
diff --git a/inventory/host_vars/st01-sw25g-r01-u35/01_base.yml b/inventory/host_vars/st01-sw25g-r01-u35/01_base.yml
@@ -11,4 +11,5 @@ device_model: 7326-56X-O-AC-B
 mgmt_mac: d0:77:ce:c1:63:80
 mgmt_address: 10.10.23.108
 serial_device: BSAHb113318
-bgp_asn: 65505
+bgp_asn: 65505
+
diff --git a/inventory/host_vars/switches-template.yml.j2 b/inventory/host_vars/switches-template.yml.j2
@@ -12,3 +12,4 @@ mgmt_mac: {{ bmc_mac }}
 mgmt_address: {{ bmc_ip_v4 }}
 serial_device: {{ serial_device }}
 bgp_asn: {{ asn }}
+

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`---`
`2`	`2`	`# defaults file for scs-landscape`
	`3`	`+logical_volumes: []`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-`
	`1`	`+---`
`2`	`2`	`chrony_bindaddresses: [ "{{ internal_address }}" ]`