diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-01-19 20:08:02 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-01-19 20:08:02 +0000 |
commit | e4d2a3a9a8886176c9fee60489103c501732f2f5 (patch) | |
tree | 33badc3be5e88abe97dcf58d8d5be4862110c9c1 | |
parent | 53ee464a37b2644998a9d360d99a760139884232 (diff) | |
parent | bed1c230f22c9f4e75b6fded053311c4d96b1887 (diff) |
Merge "Implement NTP profile"
-rw-r--r-- | lib/puppet/provider/package/norpm.rb | 4 | ||||
-rw-r--r-- | manifests/profile/base/time/ntp.pp | 28 |
2 files changed, 32 insertions, 0 deletions
diff --git a/lib/puppet/provider/package/norpm.rb b/lib/puppet/provider/package/norpm.rb index 0145d9f..0764265 100644 --- a/lib/puppet/provider/package/norpm.rb +++ b/lib/puppet/provider/package/norpm.rb @@ -33,6 +33,10 @@ Puppet::Type.type(:package).provide :norpm, :source => :rpm, :parent => :rpm do true end + def purge + true + end + def self.instances return [] end diff --git a/manifests/profile/base/time/ntp.pp b/manifests/profile/base/time/ntp.pp new file mode 100644 index 0000000..c6ce309 --- /dev/null +++ b/manifests/profile/base/time/ntp.pp @@ -0,0 +1,28 @@ +# Copyright 2017 Red Hat, Inc. +# All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +# == Class: tripleo::profile::base::ntp +# +# Enable NTP via composable services. +# + +class tripleo::profile::base::time::ntp { + # if installed, we don't want chrony to conflict with ntp. + package { 'chrony': + ensure => 'purged', + before => Service['ntp'], + } + include ::ntp +} |