9 files changed, 27 insertions, 0 deletions
diff --git a/python/vyos/configdict.py b/python/vyos/configdict.py
index 0d315f146..611f7dd6e 100644
--- a/python/vyos/configdict.py
+++ b/python/vyos/configdict.py
@@ -211,6 +211,9 @@ def vlan_to_dict(conf):
     if eff_addr and eff_addr not in vlan['ipv6_eui64_prefix']:
         vlan['ipv6_eui64_prefix_remove'].append(eff_addr)
 
+    # add the link-local by default to make IPv6 work
+    vlan['ipv6_eui64_prefix'].append('fe80::/64')
+
     # Disable IPv6 forwarding on this interface
     if conf.exists('ipv6 disable-forwarding'):
         vlan['ipv6_forwarding'] = 0
diff --git a/src/conf_mode/interfaces-bonding.py b/src/conf_mode/interfaces-bonding.py
index 267a78870..0ce376a16 100755
--- a/src/conf_mode/interfaces-bonding.py
+++ b/src/conf_mode/interfaces-bonding.py
@@ -213,6 +213,9 @@ def get_config():
     if eff_addr and eff_addr not in bond['ipv6_eui64_prefix']:
         bond['ipv6_eui64_prefix_remove'].append(eff_addr)
 
+    # add the link-local by default to make IPv6 work
+    bond['ipv6_eui64_prefix'].append('fe80::/64')
+
     # Disable IPv6 forwarding on this interface
     if conf.exists('ipv6 disable-forwarding'):
         bond['ipv6_forwarding'] = 0
diff --git a/src/conf_mode/interfaces-bridge.py b/src/conf_mode/interfaces-bridge.py
index 8826c6996..ba459f871 100755
--- a/src/conf_mode/interfaces-bridge.py
+++ b/src/conf_mode/interfaces-bridge.py
@@ -171,6 +171,9 @@ def get_config():
     if eff_addr and eff_addr not in bridge['ipv6_eui64_prefix']:
         bridge['ipv6_eui64_prefix_remove'].append(eff_addr)
 
+    # add the link-local by default to make IPv6 work
+    bridge['ipv6_eui64_prefix'].append('fe80::/64')
+
     # Disable IPv6 forwarding on this interface
     if conf.exists('ipv6 disable-forwarding'):
         bridge['ipv6_forwarding'] = 0
diff --git a/src/conf_mode/interfaces-ethernet.py b/src/conf_mode/interfaces-ethernet.py
index 7f4762e84..01a805e8b 100755
--- a/src/conf_mode/interfaces-ethernet.py
+++ b/src/conf_mode/interfaces-ethernet.py
@@ -186,6 +186,9 @@ def get_config():
     if eff_addr and eff_addr not in eth['ipv6_eui64_prefix']:
         eth['ipv6_eui64_prefix_remove'].append(eff_addr)
 
+    # add the link-local by default to make IPv6 work
+    eth['ipv6_eui64_prefix'].append('fe80::/64')
+
     # Disable IPv6 forwarding on this interface
     if conf.exists('ipv6 disable-forwarding'):
         eth['ipv6_forwarding'] = 0
diff --git a/src/conf_mode/interfaces-l2tpv3.py b/src/conf_mode/interfaces-l2tpv3.py
index 3698f3e12..45b618148 100755
--- a/src/conf_mode/interfaces-l2tpv3.py
+++ b/src/conf_mode/interfaces-l2tpv3.py
@@ -117,6 +117,9 @@ def get_config():
     if conf.exists('ipv6 address eui64'):
         l2tpv3['ipv6_eui64_prefix'].append(conf.return_value('ipv6 address eui64'))
 
+    # add the link-local by default to make IPv6 work
+    l2tpv3['ipv6_eui64_prefix'].append('fe80::/64')
+
     # Disable IPv6 forwarding on this interface
     if conf.exists('ipv6 disable-forwarding'):
         l2tpv3['ipv6_forwarding'] = 0
diff --git a/src/conf_mode/interfaces-openvpn.py b/src/conf_mode/interfaces-openvpn.py
index 99eb8d6ca..469793910 100755
--- a/src/conf_mode/interfaces-openvpn.py
+++ b/src/conf_mode/interfaces-openvpn.py
@@ -325,6 +325,9 @@ def get_config():
     if eff_addr and eff_addr not in openvpn['ipv6_eui64_prefix']:
         openvpn['ipv6_eui64_prefix_remove'].append(eff_addr)
 
+    # add the link-local by default to make IPv6 work
+    openvpn['ipv6_eui64_prefix'].append('fe80::/64')
+
     # Disable IPv6 forwarding on this interface
     if conf.exists('ipv6 disable-forwarding'):
         openvpn['ipv6_forwarding'] = 0
diff --git a/src/conf_mode/interfaces-pseudo-ethernet.py b/src/conf_mode/interfaces-pseudo-ethernet.py
index 6f194f814..d7863512e 100755
--- a/src/conf_mode/interfaces-pseudo-ethernet.py
+++ b/src/conf_mode/interfaces-pseudo-ethernet.py
@@ -168,6 +168,9 @@ def get_config():
     if eff_addr and eff_addr not in peth['ipv6_eui64_prefix']:
         peth['ipv6_eui64_prefix_remove'].append(eff_addr)
 
+    # add the link-local by default to make IPv6 work
+    peth['ipv6_eui64_prefix'].append('fe80::/64')
+
     # Disable IPv6 forwarding on this interface
     if conf.exists('ipv6 disable-forwarding'):
         peth['ipv6_forwarding'] = 0
diff --git a/src/conf_mode/interfaces-vxlan.py b/src/conf_mode/interfaces-vxlan.py
index 5ed19ddf2..69dbe32d8 100755
--- a/src/conf_mode/interfaces-vxlan.py
+++ b/src/conf_mode/interfaces-vxlan.py
@@ -120,6 +120,9 @@ def get_config():
     if conf.exists('ipv6 address eui64'):
         vxlan['ipv6_eui64_prefix'].append(conf.return_value('ipv6 address eui64'))
 
+    # add the link-local by default to make IPv6 work
+    vxlan['ipv6_eui64_prefix'].append('fe80::/64')
+
     # Disable IPv6 forwarding on this interface
     if conf.exists('ipv6 disable-forwarding'):
         vxlan['ipv6_forwarding'] = 0
diff --git a/src/conf_mode/interfaces-wireless.py b/src/conf_mode/interfaces-wireless.py
index 8f893fa8a..e7c14e3fb 100755
--- a/src/conf_mode/interfaces-wireless.py
+++ b/src/conf_mode/interfaces-wireless.py
@@ -379,6 +379,9 @@ def get_config():
     if eff_addr and eff_addr not in wifi['ipv6_eui64_prefix']:
         wifi['ipv6_eui64_prefix_remove'].append(eff_addr)
 
+    # add the link-local by default to make IPv6 work
+    wifi['ipv6_eui64_prefix'].append('fe80::/64')
+
     # ARP enable ignore
     if conf.exists('ip enable-arp-ignore'):
         wifi['ip_enable_arp_ignore'] = 1