From f6f9321a68e96b1c5a9916f5dc536b4524f3087f Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Fri, 20 Jan 2017 07:41:15 -0500
Subject: [PATCH] Purge chrony package in NTP element

If NTP is installed and used, make sure Chrony is not installed because
they would conflict each others.
We have seen some cases where NTP was started after Chrony but failed
because of port conflict.

Since Chrony is installed by default in EL7 images, we want to avoid
this conflict.

Change-Id: I186152786a27ca5bee1b288a76c2e340971596a4
---
 elements/ntp/install.d/50-ntp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/elements/ntp/install.d/50-ntp b/elements/ntp/install.d/50-ntp
index 4f97ae4b9..d663bd9e8 100755
--- a/elements/ntp/install.d/50-ntp
+++ b/elements/ntp/install.d/50-ntp
@@ -1,5 +1,10 @@
 #!/bin/bash
 set -ue
 
+# we don't want chrony and ntp conflict each others.
+if rpm -q chrony; then
+    yum remove -y chrony
+fi
+
 # ntpdate is used when the network is brought up to correct any large time skew
 install-packages ntp ntpdate