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.

Change-Id: Ia6863a1d6852fddb8e008ba695847829241bbcec

image-yaml/overcloud-images.yaml

@@ -20,7 +20,6 @@ disk_images:
       - iptables
       - enable-packages-install
       - pip-and-virtualenv-override
-      - ntp
       - overcloud-dracut
       - remove-machine-id
     packages:
@@ -28,6 +27,8 @@ disk_images:
       - python-debtcollector
       - plotnetcfg
       - sos
+      - ntp
+      - ntpd
       - device-mapper-multipath
       - python-heat-agent-puppet
       - python-heat-agent-hiera

image-yaml/overcloud-odl-rhel7.yaml

@@ -6,7 +6,6 @@ disk_images:
          type: qcow2
          distro: rhel7
          elements:
-           - ntp
            - sysctl
            - baremetal
            - dhcp-all-interfaces
@@ -17,6 +16,8 @@ disk_images:
            - grub2-deprecated
          packages:
            - java-1.8.0-openjdk
+           - ntp
+           - ntpd
            - opendaylight
            - python-heat-agent-puppet
            - python-heat-agent-hiera