Syntax error in ntp.conf on compute nodes

[Alexander Gubanov]

Detailed bug description:

On MOS 9.0 (build 376) I found error messages in /var/log/syslog on compute nodes about ntp:

<27>May 20 14:05:05 node-4 ntpd[5917]: syntax error in /etc/ntp.conf line 13, column 13
<27>May 20 14:05:40 node-4 ntpd[6373]: line 13 column 13 syntax error, unexpected T_Kod, expecting T_String

Steps to reproduce:

1. ssh to compute node
2. grep 'syntax error' /var/log/syslog

Expected results:

no errors

Actual result:

root@node-4:~# grep 'syntax error' /var/log/syslog
<27>May 20 00:02:22 node-4 ntpd[20459]: line 13 column 13 syntax error, unexpected T_Kod, expecting T_String
<27>May 20 00:02:22 node-4 ntpd[20459]: syntax error in /etc/ntp.conf line 13, column 13
<27>May 20 14:03:12 node-4 ntpd[1122]: line 13 column 13 syntax error, unexpected T_Kod, expecting T_String
...

Seems, key "default" was skiped in line
restrict -4 kod nomodify notrap nopeer noquery

it should be
restrict -4 default kod nomodify notrap nopeer noquery

[Bug Checker Bot (bug-checker)]

(This check performed automatically)
Please, make sure that bug description contains the following sections filled in with the appropriate data related to the bug you are describing:

version

For more detailed information on the contents of each of the listed sections see https://wiki.openstack.org/wiki/Fuel/How_to_contribute#Here_is_how_you_file_a_bug

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/mitaka
Review: https://review.openstack.org/319421

[Maksim Malchuk (mmalchuk)]

bug raised to high because the typo in the template produces the invalid config

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/319421
Committed: https://git.openstack.org/cgit/openstack/fuel-library/commit/?id=f399a024788689083139e39dc251b25c542cf402
Submitter: Jenkins
Branch: stable/mitaka

commit f399a024788689083139e39dc251b25c542cf402
Author: Maksim Malchuk <email address hidden>
Date: Fri May 20 22:21:05 2016 +0300

    pin puppetlabs-ntp to 4.1.2

    Need to bump the version because version 4.0.0 contain the typo in
    the ntp.conf template. 4.1.2 successfully tested and used in master.

    Change-Id: Ic3d09a3857e75a88f750a43aa1d358a857ec5afc
    (cherry picked from commit 8ed6cf08915d5bb76c0e38b6bf22502cdc60013b)
    Closes-Bug: #1584096
    Signed-off-by: Maksim Malchuk <email address hidden>

[Alexander Gubanov (ogubanov)]

I've verified it on MOS 9.0 (build 400) - fixed!

Proof:
fuel:
[root@nailgun ~]# shotgun2 short-report | head -n6
cat /etc/fuel_build_id:
 400
cat /etc/fuel_build_number:
 400
cat /etc/fuel_release:
 9.0

compute:
root@node-6:~# grep 'syntax error' /var/log/syslog
root@node-6:~# egrep -v '^(#|$)' /etc/ntp.conf
tinker panic 0 stepout 5
disable monitor
restrict -4 default kod nomodify notrap nopeer noquery
restrict -6 default kod nomodify notrap nopeer noquery
restrict 127.0.0.1
restrict ::1
server 10.109.1.8 iburst minpoll 3
driftfile /var/lib/ntp/drift