openstack/puppet-tripleo
Code Issues Proposed changes

Remove ntp

Browse Source 
We no longer support ntp so we should remove the puppet classes and
puppet-ntp usage.

Change-Id: I8d813fdccb45a464e5bbecda2de0f322299cf6e3
Depends-On: https://review.opendev.org/#/c/656999/
Related-Blueprint: tripleo-chrony
This commit is contained in:
Alex Schultz 2019-05-03 12:07:16 -06:00
parent 23e8ef2ea5
commit ce0cffe077
4 changed files with 4 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Puppetfile_extras
View File

@ -41,10 +41,6 @@ mod 'certmonger',
:git => 'https://github.com/saltedsignal/puppet-certmonger', :git => 'https://github.com/saltedsignal/puppet-certmonger',
:ref => 'v1.1.1' :ref => 'v1.1.1'
mod 'ntp',
:git => 'https://github.com/puppetlabs/puppetlabs-ntp',
:ref => '4.2.0'
mod 'ptp', mod 'ptp',
:git => 'https://github.com/redhat-nfvpe/ptp', :git => 'https://github.com/redhat-nfvpe/ptp',
:ref => 'master' :ref => 'master'

35
manifests/profile/base/time/ntp.pp
View File

@ -1,35 +0,0 @@
# 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. 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']
}
service { 'chrony-wait':
ensure => stopped,
enable => false,
before => Class['ntp']
}
include ::ntp
}

4
releasenotes/notes/remove-ntp-34d5eb69bfc231b0.yaml Normal file
View File

@ -0,0 +1,4 @@
---
upgrade:
- |
Remove ntp profile and puppet-ntp usage.

39
spec/classes/tripleo_profile_base_time_ntp_spec.rb
View File

@ -1,39 +0,0 @@
#
# Copyright (C) 2017 Red Hat, Inc.
#
# 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.
#
require 'spec_helper'
describe 'tripleo::profile::base::time::ntp' do
shared_examples_for 'tripleo::profile::base::time::ntp' do
context 'with defaults' do
it { is_expected.to contain_class('tripleo::profile::base::time::ntp') }
it { is_expected.to contain_service('chronyd').with(
:ensure => 'stopped',
:enable => false) }
it { is_expected.to contain_class('ntp') }
end
end
on_supported_os.each do |os, facts|
context "on #{os}" do
let (:facts) {
facts
}
it_behaves_like 'tripleo::profile::base::time::ntp'
end
end
end