ntp.conf is overwritten by os-apply-config

[Marios Andreou]

As reported in https://bugzilla.redhat.com/show_bug.cgi?id=1441587 we should remove the ntp element from images as it was replaced by puppet. Presence of files from this element causes os-apply-config to override what puppet set.

review to master merged here https://review.openstack.org/#/c/456218/ filing this bug for the stable/ocata cherrypick

https://review.openstack.org/#/q/6cea8adf2ffa5e4120d3d7ee8715916f6ca568c9,n,z

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/460895
Committed: https://git.openstack.org/cgit/openstack/tripleo-common/commit/?id=3ec8d492ccad7677a79021ace2d86818a3431e3b
Submitter: Jenkins
Branch: stable/ocata

commit 3ec8d492ccad7677a79021ace2d86818a3431e3b
Author: Lukas Bezdicka <email address hidden>
Date: Wed Apr 12 15:28:50 2017 +0200

    Remove ntp element

    The ntp element should not be used as it was replaced by puppet.
    Presence of files from this element causes os-apply-config to
    override what puppet set.

    Closes-Bug: 1687364
    Change-Id: Ia6863a1d6852fddb8e008ba695847829241bbcec
    (cherry picked from commit 6cea8adf2ffa5e4120d3d7ee8715916f6ca568c9)

[Emilien Macchi (emilienm)]

There are no currently open reviews on this bug, changing the status back to the previous state and unassigning. If there are active reviews related to this bug, please include links in comments.

[Ben Nemec (bnemec)]

This appears to have been fixed and backported successfully.

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/tripleo-common 6.1.1 release.