From 8c764acbca76ec3da46b1d074a11839cf7b854a8 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Thu, 2 Nov 2017 14:35:55 -0500 Subject: [PATCH] systemd.j2 touchups --- roles/network/templates/network/systemd.j2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/network/templates/network/systemd.j2 b/roles/network/templates/network/systemd.j2 index 9ff1a21d4..c84b9735a 100644 --- a/roles/network/templates/network/systemd.j2 +++ b/roles/network/templates/network/systemd.j2 @@ -9,7 +9,7 @@ iface br0 inet manual {% else %} iface br0 inet static {% endif %} -{% if discovered_lan_iface != "none" %} +{% if iiab_wired_lan_iface != "none" %} bridge_ports {{ iiab_wired_lan_iface }} {% endif %} bridge_maxwait 0 @@ -25,10 +25,10 @@ iface br0 inet static {% if iiab_network_mode != "LanController" %} ################# GATEWAY or APPLIANCE ######################### # start dhcp clients -{% if dhcpcd_result == "enabled" or wan_in_interfaces == "true" %} +{% if dhcpcd_result == "enabled" or wan_in_interfaces %} # client or user defined {% endif %} -{% if dhcpcd_result != "enabled" and wan_in_interfaces == "false" %} +{% if dhcpcd_result != "enabled" and not wan_in_interfaces %} #cover butt auto {{ iiab_wan_iface }} iface {{ iiab_wan_iface }} inet dhcp