diff --git a/manifests/profile/base/tuned.pp b/manifests/profile/base/tuned.pp deleted file mode 100644 index 2db5d4623..000000000 --- a/manifests/profile/base/tuned.pp +++ /dev/null @@ -1,41 +0,0 @@ -# == Class: tripleo::profile::base::tuned -# -# Configures tuned service. -# -# === Parameters: -# -# [*profile*] -# (optional) tuned active profile. -# Defaults to 'throughput-performance' -# -# [*custom_profile*] -# (optional) string in INI format defining a custom profile -# Defaults to undef -# -class tripleo::profile::base::tuned ( - $profile = 'throughput-performance', - $custom_profile = undef -) { - ensure_resource('package', 'tuned', { ensure => 'present' }) - if !empty($custom_profile) { - file { "/etc/tuned/${profile}": - ensure => 'directory', - owner => 'root', - group => 'root', - mode => '0755', - } -> file { "/etc/tuned/${profile}/tuned.conf": - ensure => present, - before => Exec['tuned-adm'], - owner => 'root', - group => 'root', - mode => '0644', - content => $custom_profile, - } - } - exec { 'tuned-adm': - path => ['/bin', '/usr/bin', '/sbin', '/usr/sbin'], - command => "tuned-adm profile ${profile}", - unless => "tuned-adm active | grep -q '${profile}'", - require => Package['tuned'], - } -} diff --git a/releasenotes/notes/tuned-removed-ab68a7109a1e7403.yaml b/releasenotes/notes/tuned-removed-ab68a7109a1e7403.yaml new file mode 100644 index 000000000..63aed5b70 --- /dev/null +++ b/releasenotes/notes/tuned-removed-ab68a7109a1e7403.yaml @@ -0,0 +1,4 @@ +--- +deprecations: + - The tuned puppet manifest for `tuned` was removed. The heat template + invoking this manifest has been converted to Ansible. diff --git a/spec/classes/tripleo_profile_base_tuned_spec.rb b/spec/classes/tripleo_profile_base_tuned_spec.rb deleted file mode 100644 index 58b94fd71..000000000 --- a/spec/classes/tripleo_profile_base_tuned_spec.rb +++ /dev/null @@ -1,65 +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::tuned' do - - shared_examples_for 'tripleo::profile::base::tuned' do - context 'with profile' do - let :params do - { - :profile => 'virtual-compute' - } - end - - it 'should run tuned-adm exec' do - is_expected.to contain_exec('tuned-adm') - end - end - context 'with custom profile' do - let :params do - { - :profile => 'custom', - :custom_profile => 'foo' - } - end - - it 'should create a custom tuned profile' do - is_expected.to contain_file('/etc/tuned/custom/tuned.conf').with({ - 'content' => 'foo', - 'owner' => 'root', - 'group' => 'root', - 'mode' => '0644', - }) - end - it 'should run a tuned-adm exec to set the custom profile' do - is_expected.to contain_exec('tuned-adm').with_command( - 'tuned-adm profile custom' - ) - end - end - end - on_supported_os.each do |os, facts| - context "on #{os}" do - let(:facts) { - facts - } - - it_behaves_like 'tripleo::profile::base::tuned' - end - end -end