diff --git a/defaults/main.yml b/defaults/main.yml index 1305942..11dda63 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -18,7 +18,7 @@ nspawn_networks: nspawn_address: bridge: "nspawn0" - interface: "mv-mv-nspawn0" + interface: "mv-nspawn0" address: dhcp # This is a list of items that will be passed into the container as READ-ONLY diff --git a/tasks/main.yml b/tasks/main.yml index 3f1a38f..e85f8b5 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -362,10 +362,10 @@ systemd_networks: |- {% set _networks = [] %} {% for _, value in nspawn_combined_networks.items() %} - {% if value.bridge is defined %} - {% set _network = {'interface': 'mv-mv-' + value.bridge.split('br-')[-1]} %} + {% if value.interface is defined %} + {% set _network = {'interface': 'mv-' + value.interface} %} {% else %} - {% set _network = {'interface': value.interface} %} + {% set _network = {'interface': 'mv-mv-' + value.bridge.split('br-')[-1]} %} {% endif %} {% if value.address is defined %} {% set _ = _network.__setitem__('address', value.address) %} diff --git a/templates/container_config.nspawn.j2 b/templates/container_config.nspawn.j2 index 180db65..e57502b 100644 --- a/templates/container_config.nspawn.j2 +++ b/templates/container_config.nspawn.j2 @@ -25,9 +25,12 @@ Bind={{ bind }}:{{ bind }} [Network] {% set macvlans = [] %} {% for key, value in nspawn_combined_networks.items() %} -{% if value.bridge is defined %} -{% set _ = macvlans.append('mv-' + value.bridge.split('br-')[-1]) %} +{% if value.interface is defined %} +{% set macvlan = value.interface %} +{% else %} +{% set macvlan = 'mv-' + value.bridge.split('br-')[-1] %} {% endif %} +{% set _ = macvlans.append(macvlan) %} {% endfor %} {% if macvlans | length > 0 %} Private=yes diff --git a/templates/container_config_old.nspawn.j2 b/templates/container_config_old.nspawn.j2 index 0e8f4ee..253fa12 100644 --- a/templates/container_config_old.nspawn.j2 +++ b/templates/container_config_old.nspawn.j2 @@ -19,7 +19,9 @@ {% endif %} {% set macvlans = [] %} {% for key, value in nspawn_combined_networks.items() %} -{% if value.bridge is defined %} +{% if value.interface is defined %} +{% set macvlan = value.interface %} +{% else %} {% set macvlan = 'mv-' + value.bridge.split('br-')[-1] %} {% endif %} {% if macvlan not in macvlans %}