refactor(bootstrap): nest network fields under system.network to match main project schema
This commit is contained in:
@@ -48,17 +48,17 @@
|
||||
ide2: "{{ hypervisor_cfg.storage }}:cloudinit"
|
||||
net:
|
||||
net0: >-
|
||||
virtio,bridge={{ system_cfg.network }}{% if system_cfg.vlan is defined and system_cfg.vlan | string | length > 0 %},tag={{ system_cfg.vlan }}{% endif %}
|
||||
virtio,bridge={{ system_cfg.network.bridge }}{% if system_cfg.network.vlan is defined and system_cfg.network.vlan | string | length > 0 %},tag={{ system_cfg.network.vlan }}{% endif %}
|
||||
ipconfig:
|
||||
ipconfig0: >-
|
||||
{{
|
||||
'ip=' ~ system_cfg.ip ~ '/' ~ system_cfg.prefix
|
||||
~ (',gw=' ~ system_cfg.gateway if system_cfg.gateway is defined and system_cfg.gateway | length else '')
|
||||
if system_cfg.ip is defined and system_cfg.ip | string | length
|
||||
'ip=' ~ system_cfg.network.ip ~ '/' ~ system_cfg.network.prefix
|
||||
~ (',gw=' ~ system_cfg.network.gateway if system_cfg.network.gateway is defined and system_cfg.network.gateway | length else '')
|
||||
if system_cfg.network.ip is defined and system_cfg.network.ip | string | length
|
||||
else 'ip=dhcp'
|
||||
}}
|
||||
nameservers: "{{ system_cfg.dns.servers if system_cfg.dns.servers | length else omit }}"
|
||||
searchdomains: "{{ system_cfg.dns.search if system_cfg.dns.search | length else omit }}"
|
||||
nameservers: "{{ system_cfg.network.dns.servers if system_cfg.network.dns.servers | length else omit }}"
|
||||
searchdomains: "{{ system_cfg.network.dns.search if system_cfg.network.dns.search | length else omit }}"
|
||||
onboot: true
|
||||
state: present
|
||||
|
||||
|
||||
Reference in New Issue
Block a user