392eacb092
The dracut-config-generic package (sometimes installed by default in the overcloud image) provides a configuration file that turns off the host-specific initramfs generation with dracut: $ cat /usr/lib/dracut/dracut.conf.d/02-generic-image.conf hostonly="no" The result is that the generated initrams does not contain: - /etc/systemd/journald.conf - /etc/systemd/system.conf - /etc/hostname - /etc/machine-id - /etc/vconsole.conf - /etc/locale.conf - /etc/modules-load.d/*.conf - /etc/sysctl.d/*.conf - /etc/sysctl.conf Especially problematic is the absence of sysctl.conf when ipv6 is disabled via "KernelDisableIPv6: 1" because we end up half-disabling ipv6 and services like rpbcind end up in failed state. Original issue: https://bugs.launchpad.net/tripleo/+bug/1830574 This commit builds on top of https://review.opendev.org/#/c/661528/ adding the '--hostonly' option to dracut so to bypass 'hostonly="no"' eventually contained in the default config file. Change-Id: Ia4a39721268fe9bb0fdcc8bf4eb148263d4df46e
57 lines
1.8 KiB
Puppet
57 lines
1.8 KiB
Puppet
# 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')
|
|
#
|
|
# [*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),
|
|
$sysctl_settings = hiera('sysctl_settings', undef),
|
|
) {
|
|
|
|
if $module_list {
|
|
create_resources(kmod::load, $module_list, { })
|
|
}
|
|
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' |>
|
|
}
|