fix dhcp metric

files/bridge-post-scripts/post-up.sh.j2

@@ -33,8 +33,12 @@ handle_gateway() {
   if [[ "$GATEWAY_ADDRESS" -eq "_use_last" ]]; then
     GATEWAY_ADDRESS=$(subnetcalc "$BRIDGE_IP" -n | grep "Host Range" | awk '{print $7}')
   fi
+
   ip route add default via "$GATEWAY_ADDRESS" table "$GATEWAY_NEXT_HOP_MARK"
+{% if br.type != "dhcp" %}
   ip route add default via "$GATEWAY_ADDRESS" metric "$GATEWAY_NEXT_HOP_MARK"
+{% endif %}
+
   if [[ "$GATEWAY_NO_ORIGIN" -eq 0 ]]; then
     ip rule add pref 100 fwmark "$GATEWAY_NEXT_HOP_MARK" lookup "$GATEWAY_NEXT_HOP_MARK"
     eth_origin -A "$BRIDGE_NAME" "$GATEWAY_ID" "$GATEWAY_ADDRESS" "$GATEWAY_MAC"

files/interfaces.j2

@@ -69,8 +69,12 @@ bridge_maxwait 3
 {% if br.type == "static" %}
 address {{br.address}}
 {% elif br.type == "dhcp" %}
+{% if br.gateways and br.gateways | length > 0 %}
+metric {{ 1100 + br.gateways[0].id }}
+{% else %}
 metric 9999
 {% endif %}
+{% endif %}
 post-up {{ansible_user_dir}}/nextgen-router/scripts/{{br.name}}/post-up.sh
 pre-down {{ansible_user_dir}}/nextgen-router/scripts/{{br.name}}/pre-down.sh
 

network.yaml

@@ -78,7 +78,7 @@
           content: |
             option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;
             send host-name = gethostname();
-            request subnet-mask, broadcast-address;
+            request subnet-mask, broadcast-address, routers;
             timeout 300;
 
           dest: /etc/dhcp/dhclient.conf