From ce0cffe07715838868b1a65af0d9dc5fd667a80e Mon Sep 17 00:00:00 2001
From: Alex Schultz <aschultz@redhat.com>
Date: Fri, 3 May 2019 12:07:16 -0600
Subject: [PATCH] Remove ntp

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
---
 Puppetfile_extras                             |  4 --
 manifests/profile/base/time/ntp.pp            | 35 -----------------
 .../notes/remove-ntp-34d5eb69bfc231b0.yaml    |  4 ++
 .../tripleo_profile_base_time_ntp_spec.rb     | 39 -------------------
 4 files changed, 4 insertions(+), 78 deletions(-)
 delete mode 100644 manifests/profile/base/time/ntp.pp
 create mode 100644 releasenotes/notes/remove-ntp-34d5eb69bfc231b0.yaml
 delete mode 100644 spec/classes/tripleo_profile_base_time_ntp_spec.rb

diff --git a/Puppetfile_extras b/Puppetfile_extras
index 46c813d5c..3676e2fd0 100644
--- a/Puppetfile_extras
+++ b/Puppetfile_extras
@@ -41,10 +41,6 @@ mod 'certmonger',
   :git => 'https://github.com/saltedsignal/puppet-certmonger',
   :ref => 'v1.1.1'
 
-mod 'ntp',
-  :git => 'https://github.com/puppetlabs/puppetlabs-ntp',
-  :ref => '4.2.0'
-
 mod 'ptp',
   :git => 'https://github.com/redhat-nfvpe/ptp',
   :ref => 'master'
diff --git a/manifests/profile/base/time/ntp.pp b/manifests/profile/base/time/ntp.pp
deleted file mode 100644
index 5ced0e7a4..000000000
--- a/manifests/profile/base/time/ntp.pp
+++ /dev/null
@@ -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
-}
diff --git a/releasenotes/notes/remove-ntp-34d5eb69bfc231b0.yaml b/releasenotes/notes/remove-ntp-34d5eb69bfc231b0.yaml
new file mode 100644
index 000000000..b1e44933a
--- /dev/null
+++ b/releasenotes/notes/remove-ntp-34d5eb69bfc231b0.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    Remove ntp profile and puppet-ntp usage.
diff --git a/spec/classes/tripleo_profile_base_time_ntp_spec.rb b/spec/classes/tripleo_profile_base_time_ntp_spec.rb
deleted file mode 100644
index ec4b55fb7..000000000
--- a/spec/classes/tripleo_profile_base_time_ntp_spec.rb
+++ /dev/null
@@ -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