diff options
| author |   Alex Schultz <aschultz@redhat.com> | 2017-03-06 10:02:16 -0700 |
|---|---|---|
| committer | Alex Schultz <aschultz@redhat.com> | 2017-03-07 07:16:18 -0700 |
| commit | 6d204f4f5984b993bb0f38dfde0e47b373a1fe32 (patch) | |
| tree | 3e42b208ebe38b87dc2b43724f5916b7df0123bb /manifests/profile | |
| parent | 0cad4e0a8a3ee2f63047fb0a8b76cc43eb2a3a1f (diff) | |
Stop the chronyd service
Since the norpm provider can prevent the chronyd package from actually
getting purged, we need to make sure the chronyd service is stopped and
disabled so that it does not conflict with ntpd.
Change-Id: I7a697aba7aa5a27ba4ab6e46018057f7f01dfab2
Closes-Bug: #1665426
(cherry picked from commit 37ba3a8db5e38955469e8bc9158388379d64abc8)
Diffstat (limited to 'manifests/profile')
| -rw-r--r-- | manifests/profile/base/time/ntp.pp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/manifests/profile/base/time/ntp.pp b/manifests/profile/base/time/ntp.pp index c6ce309..06a3048 100644 --- a/manifests/profile/base/time/ntp.pp +++ b/manifests/profile/base/time/ntp.pp @@ -19,10 +19,12 @@ # class tripleo::profile::base::time::ntp { - # if installed, we don't want chrony to conflict with ntp. - package { 'chrony': - ensure => 'purged', - before => Service['ntp'], + # If installed, we don't want chrony to conflict with ntp. LP#1665426 + # It should be noted that this work even if the package is not installed + service { 'chronyd': + ensure => stopped, + enable => false, + before => Class['ntp'] } include ::ntp } |