Make a note to remove special wheezy config once #670662 is fixed

diff --git a/modules/ntp/templates/ntp.conf b/modules/ntp/templates/ntp.conf
index fdbde074c959249c2b98c9c3a4575ce811cd1407..66615d41f461fe29f84943e55c985071d15f7f9b 100644 (file)
--- a/modules/ntp/templates/ntp.conf
+++ b/modules/ntp/templates/ntp.conf
@@ -6,6 +6,8 @@
 driftfile /var/lib/ntp/ntp.drift
 statsdir /var/log/ntpstats/
 
+# XXX REMOVE wheezy special handling when 670662 gets fixed
+
 <% if %w{wheezy}.include?(scope.lookupvar('::lsbdistcodename')) -%>
 statistics loopstats peerstats clockstats
 filegen loopstats file loopstats type day enable
@@ -35,7 +37,7 @@ server chronos.duth.gr iburst
 <%   end -%>
 <% elsif fqdn == "ancina.debian.org" -%>
 server ntp.ugent.be iburst dynamic
-<% elsif scope.lookupvar('site::nodeinfo')['misc']['natted'] -%>
+<% elsif scope.lookupvar('site::nodeinfo')['misc']['natted'] or if %w{wheezy}.include?(scope.lookupvar('::lsbdistcodename')) -%>
 # autokey doesn't work behind nat
 
 # merikanto's and orff's ipv4 IP, hard coded for the benefit of hosts