From 2e93afb84a45ce5ac29d0f3e22cfd13bc1663bd3 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Wed, 14 Jan 2026 19:17:36 +0100 Subject: [PATCH] Sync host configuration with Ansible defaults This synchronises the following files with the Ansible inventory defaults in ansible/inventory/group_vars/all: - compute.yml - controllers.yml - infra-vms.yml - monitoring.yml - seed-hypervisor.yml - seed.yml Change-Id: I9ef77d6119be910710eaffa8bc70bb207323f268 Signed-off-by: Pierre Riteau --- ansible/inventory/group_vars/all/controllers | 1 + .../inventory/group_vars/all/seed-hypervisor | 3 ++- ansible/inventory/group_vars/all/seed-vm | 15 ++++++++++++++- etc/kayobe/controllers.yml | 18 ++++++++++++++++-- etc/kayobe/infra-vms.yml | 12 ++++++++++++ etc/kayobe/seed.yml | 12 ++++++++++++ 6 files changed, 57 insertions(+), 4 deletions(-) diff --git a/ansible/inventory/group_vars/all/controllers b/ansible/inventory/group_vars/all/controllers index 5d2f2b804..a7b2097bd 100644 --- a/ansible/inventory/group_vars/all/controllers +++ b/ansible/inventory/group_vars/all/controllers @@ -162,6 +162,7 @@ controller_lvm_group_data_lv_docker_volumes: mount: True mntp: "{{ docker_volumes_path }}" +# Podman volumes LVM backing volume. controller_lvm_group_data_lv_podman_volumes: lvname: podman-volumes size: "{{ controller_lvm_group_data_lv_podman_volumes_size }}" diff --git a/ansible/inventory/group_vars/all/seed-hypervisor b/ansible/inventory/group_vars/all/seed-hypervisor index 0c2a0e6f9..80fe27851 100644 --- a/ansible/inventory/group_vars/all/seed-hypervisor +++ b/ansible/inventory/group_vars/all/seed-hypervisor @@ -44,7 +44,8 @@ seed_hypervisor_luks_devices: [] # volume group for libvirt storage. seed_hypervisor_lvm_groups: [] -# Suggested list of seed hypervisor volume groups for libvirt. Not used by default. +# Suggested list of seed hypervisor volume groups for libvirt. Not used by +# default. seed_hypervisor_lvm_groups_with_data: - "{{ seed_hypervisor_lvm_group_data }}" diff --git a/ansible/inventory/group_vars/all/seed-vm b/ansible/inventory/group_vars/all/seed-vm index 674d0384b..73c50ed73 100644 --- a/ansible/inventory/group_vars/all/seed-vm +++ b/ansible/inventory/group_vars/all/seed-vm @@ -62,7 +62,20 @@ seed_vm_data_capacity: 100G # Format of the seed VM data volume. seed_vm_data_format: qcow2 -# List of network interfaces to attach to the seed VM. +# List of network interfaces to attach to the seed VM. Format is as accepted by +# the stackhpc.libvirt-vm role's libvirt_vms.interfaces variable. Default is +# one interface for each network in 'network_interfaces'. +# +# Example with one interface connected to a libvirt network called +# 'libvirt-net', and another interface directly plugged into a host device +# called 'eth1': +# +# seed_vm_interfaces: +# - network: libvirt-net +# - type: direct +# source: +# dev: eth1 +# seed_vm_interfaces: "{{ network_interfaces | sort | map('net_libvirt_vm_network') | list }}" # Boot firmware. Possible values are 'bios' or 'efi'. Default is 'efi'. diff --git a/etc/kayobe/controllers.yml b/etc/kayobe/controllers.yml index 066c42d33..1cc50c30b 100644 --- a/etc/kayobe/controllers.yml +++ b/etc/kayobe/controllers.yml @@ -106,8 +106,7 @@ # Whether a 'data' LVM volume group should exist on controller hosts. By # default this contains a 'docker-volumes' logical volume for Docker volume -# storage. -# Default is false. +# storage. Default is false. #controller_lvm_group_data_enabled: # Controller LVM volume group for data. See mrlesmithjr.manage_lvm role for @@ -118,18 +117,33 @@ # invalid value to require configuration. #controller_lvm_group_data_disks: +# List of LVM logical volumes for the data volume group when using docker. +#controller_lvm_group_data_docker_lvs: + +# List of LVM logical volumes for the data volume group when using podman. +#controller_lvm_group_data_podman_lvs: + # List of LVM logical volumes for the data volume group. #controller_lvm_group_data_lvs: # Docker volumes LVM backing volume. #controller_lvm_group_data_lv_docker_volumes: +# Podman volumes LVM backing volume. +#controller_lvm_group_data_lv_podman_volumes: + # Size of docker volumes LVM backing volume. #controller_lvm_group_data_lv_docker_volumes_size: # Filesystem for docker volumes LVM backing volume. ext4 allows for shrinking. #controller_lvm_group_data_lv_docker_volumes_fs: +# Size of podman volumes LVM backing volume. +#controller_lvm_group_data_lv_podman_volumes_size: + +# Filesystem for podman volumes LVM backing volume. ext4 allows for shrinking. +#controller_lvm_group_data_lv_podman_volumes_fs: + ############################################################################### # Controller node sysctl configuration. diff --git a/etc/kayobe/infra-vms.yml b/etc/kayobe/infra-vms.yml index 25c39f478..59147aac7 100644 --- a/etc/kayobe/infra-vms.yml +++ b/etc/kayobe/infra-vms.yml @@ -123,6 +123,12 @@ # an invalid value to require configuration. #infra_vm_lvm_group_data_disks: +# List of LVM logical volumes for the data volume group when using docker. +#infra_vm_lvm_group_data_docker_lvs: + +# List of LVM logical volumes for the data volume group when using podman. +#infra_vm_lvm_group_data_podman_lvs: + # List of LVM logical volumes for the data volume group. #infra_vm_lvm_group_data_lvs: @@ -135,6 +141,12 @@ # Filesystem for docker volumes LVM backing volume. ext4 allows for shrinking. #infra_vm_lvm_group_data_lv_docker_volumes_fs: +# Size of podman volumes LVM backing volume. +#infra_vm_lvm_group_data_lv_podman_volumes_size: + +# Filesystem for podman volumes LVM backing volume. ext4 allows for shrinking. +#infra_vm_lvm_group_data_lv_podman_volumes_fs: + ############################################################################### # Infrastructure VM node sysctl configuration. diff --git a/etc/kayobe/seed.yml b/etc/kayobe/seed.yml index 6b4eb9f9b..7a335ea2f 100644 --- a/etc/kayobe/seed.yml +++ b/etc/kayobe/seed.yml @@ -60,6 +60,12 @@ # value to require configuration. #seed_lvm_group_data_disks: +# List of LVM logical volumes for the data volume group when using docker. +#seed_lvm_group_data_docker_lvs: + +# List of LVM logical volumes for the data volume group when using podman. +#seed_lvm_group_data_podman_lvs: + # List of LVM logical volumes for the data volume group. #seed_lvm_group_data_lvs: @@ -72,6 +78,12 @@ # Filesystem for docker volumes LVM backing volume. ext4 allows for shrinking. #seed_lvm_group_data_lv_docker_volumes_fs: +# Size of podman volumes LVM backing volume. +#seed_lvm_group_data_lv_podman_volumes_size: + +# Filesystem for podman volumes LVM backing volume. ext4 allows for shrinking. +#seed_lvm_group_data_lv_podman_volumes_fs: + ############################################################################### # Seed node sysctl configuration.