Merge branch 'current' of github.com:vyos/vyos-1x into current

1 files changed, 13 insertions, 1 deletions

diff --git a/src/conf_mode/ntp.py b/src/conf_mode/ntp.py
index 9a4846bdf..2a6088575 100755
--- a/src/conf_mode/ntp.py
+++ b/src/conf_mode/ntp.py
@@ -62,11 +62,20 @@ restrict {{ n.address }} mask {{ n.netmask }} nomodify notrap nopeer
 {% endfor -%}
 {% endif %}
 
+{% if listen_address -%}
+# NTP should listen on configured addresses only
+interface ignore wildcard
+{% for a in listen_address -%}
+interface listen {{ a }}
+{% endfor -%}
+{% endif %}
+
 """
 
 default_config_data = {
     'servers': [],
-    'allowed_networks': []
+    'allowed_networks': [],
+    'listen_address': []
 }
 
 def get_config():
@@ -89,6 +98,9 @@ def get_config():
 
             ntp['allowed_networks'].append(net)
 
+    if conf.exists('listen-address'):
+        ntp['listen_address'] = conf.return_values('listen-address')
+
     if conf.exists('server'):
         for node in conf.list_nodes('server'):
             options = []