diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-03-07 13:58:35 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-03-07 13:58:35 +0000 |
| commit | 0d15f1de5ab762ff87f2d3e57a2fec886e6f1f47 (patch) | |
| tree | 992c6031951397cf19de85d1071f47d9abb1bbf2 /manifests | |
| parent | b235d6b096d96609b0047268c0284b43e1aafe47 (diff) | |
| parent | 37ba3a8db5e38955469e8bc9158388379d64abc8 (diff) | |
Merge "Stop the chronyd service"
Diffstat (limited to 'manifests')
| -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 } |