Remove kernel class
The code isn't useful anymore. Depends-On: https://review.opendev.org/707289 Change-Id: I23704246f5ba905666db0d2508245ca764d87161
This commit is contained in:
parent
2039b4d842
commit
8e10ee78c8
|
@ -1,72 +0,0 @@
|
||||||
# Copyright 2016 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::kernel
|
|
||||||
#
|
|
||||||
# Load and configure Kernel modules.
|
|
||||||
#
|
|
||||||
# === Parameters
|
|
||||||
#
|
|
||||||
# [*module_list*]
|
|
||||||
# (Optional) List of kernel modules to load.
|
|
||||||
# Defaults to hiera('kernel_modules')
|
|
||||||
#
|
|
||||||
# [*package_list*]
|
|
||||||
# (Optional) List of additional kernel related packages to load
|
|
||||||
# Defaults to hiera('kernel_packages')
|
|
||||||
#
|
|
||||||
# [*sysctl_settings*]
|
|
||||||
# (Optional) List of sysctl settings to load.
|
|
||||||
# Defaults to hiera('sysctl_settings')
|
|
||||||
#
|
|
||||||
class tripleo::profile::base::kernel (
|
|
||||||
$module_list = hiera('kernel_modules', undef),
|
|
||||||
$package_list = hiera('kernel_packages', undef),
|
|
||||||
$sysctl_settings = hiera('sysctl_settings', undef),
|
|
||||||
) {
|
|
||||||
|
|
||||||
if $module_list {
|
|
||||||
create_resources(kmod::load, $module_list, { })
|
|
||||||
}
|
|
||||||
|
|
||||||
if $package_list {
|
|
||||||
$pkg_defaults = {
|
|
||||||
'tag' => 'kernel-package'
|
|
||||||
}
|
|
||||||
create_resources(package, $package_list, $pkg_defaults)
|
|
||||||
# ensure we install the package prior to trying to load kmods to make sure
|
|
||||||
# if the package list includes a kmod that it will be available.
|
|
||||||
Package<| tag == 'kernel-package' |> -> Exec<| tag == 'kmod::load' |>
|
|
||||||
}
|
|
||||||
|
|
||||||
if $sysctl_settings {
|
|
||||||
create_resources(sysctl::value, $sysctl_settings, { })
|
|
||||||
}
|
|
||||||
Exec <| tag == 'kmod::load' |> -> Sysctl <| |>
|
|
||||||
|
|
||||||
# RHEL 7.4+ workaround where this functionality is built into the
|
|
||||||
# kernel instead of being built as a module.
|
|
||||||
# That way, we can support both 7.3 and 7.4 RHEL versions.
|
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1387537
|
|
||||||
Exec <| title == 'modprobe nf_conntrack_proto_sctp' |> { returns => [0,1] }
|
|
||||||
|
|
||||||
# Rebuild initramfs to include kernel parameter changes in initramfs
|
|
||||||
exec { 'rebuild initramfs':
|
|
||||||
command => 'dracut -f -v --hostonly',
|
|
||||||
path => '/bin:/sbin:/usr/bin:/usr/sbin',
|
|
||||||
refreshonly => true,
|
|
||||||
}
|
|
||||||
Sysctl <| |> ~> Exec <| title == 'rebuild initramfs' |>
|
|
||||||
}
|
|
|
@ -1,72 +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::kernel' do
|
|
||||||
|
|
||||||
shared_examples_for 'tripleo::profile::base::kernel' do
|
|
||||||
context 'with kernel modules' do
|
|
||||||
let :params do
|
|
||||||
{
|
|
||||||
:module_list => {
|
|
||||||
'nf_conntrack' => {},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'should load kernel module' do
|
|
||||||
is_expected.to contain_kmod__load('nf_conntrack')
|
|
||||||
end
|
|
||||||
end
|
|
||||||
context 'with packages' do
|
|
||||||
let :params do
|
|
||||||
{
|
|
||||||
:package_list => {
|
|
||||||
'kmod_special' => {},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'should install package' do
|
|
||||||
is_expected.to contain_package('kmod_special').with('tag' => 'kernel-package')
|
|
||||||
end
|
|
||||||
end
|
|
||||||
context 'with sysctl settings' do
|
|
||||||
let :params do
|
|
||||||
{
|
|
||||||
:sysctl_settings => {
|
|
||||||
'net.ipv4.tcp_keepalive_intvl' => { 'value' => '1'},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'should load kernel module' do
|
|
||||||
is_expected.to contain_sysctl__value('net.ipv4.tcp_keepalive_intvl')
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
on_supported_os.each do |os, facts|
|
|
||||||
context "on #{os}" do
|
|
||||||
let(:facts) {
|
|
||||||
facts
|
|
||||||
}
|
|
||||||
|
|
||||||
it_behaves_like 'tripleo::profile::base::kernel'
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
Loading…
Reference in New Issue