sandwich/Ansible-Bootstrap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(runtime): migrate roles to nested system fields

Browse Source
This commit is contained in:
Sandwich
2026-02-11 05:37:18 +01:00
parent db08609acf
commit fcc7c6aeb6
23 changed files with 128 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
roles/virtualization/templates/cloud-network-config.yml.j2
View File

@@ -5,12 +5,8 @@ network:
match:
macaddress: "{{ virtualization_mac_address }}"
{% set has_static = system_cfg.ip is defined and system_cfg.ip | string | length %}
{% set dns_value = system_cfg.dns_servers if system_cfg.dns_servers is defined else '' %}
{% set dns_list_raw = dns_value if dns_value is iterable and dns_value is not string else dns_value.split(',') %}
{% set dns_list = dns_list_raw | map('trim') | reject('equalto', '') | list %}
{% set search_value = system_cfg.dns_search if system_cfg.dns_search is defined else '' %}
{% set search_list_raw = search_value if search_value is iterable and search_value is not string else search_value.split(',') %}
{% set search_list = search_list_raw | map('trim') | reject('equalto', '') | list %}
{% set dns_list = system_cfg.dns.servers | default([]) %}
{% set search_list = system_cfg.dns.search | default([]) %}
{% if has_static %}
addresses:
- "{{ system_cfg.ip }}/{{ system_cfg.prefix }}"
@@ -19,12 +15,12 @@ network:
{% endif %}
{% else %}
dhcp4: true
{% if (system_cfg.dns_servers is defined and system_cfg.dns_servers | length) or (system_cfg.dns_search is defined and system_cfg.dns_search | length) %}
{% if dns_list | length or search_list | length %}
dhcp4-overrides:
{% if system_cfg.dns_servers is defined and system_cfg.dns_servers | length %}
{% if dns_list | length %}
use-dns: false
{% endif %}
{% if system_cfg.dns_search is defined and system_cfg.dns_search | length %}
{% if search_list | length %}
use-domains: false
{% endif %}
{% endif %}