Merge pull request #788 from mlibrary/grub-args

rrotter · web-flow · commit 84b8642e8bc8 · 2025-01-08T12:31:36.000-05:00
allow linux kernel args to be set in hieradata
diff --git a/manifests/profile/grub.pp b/manifests/profile/grub.pp
@@ -6,9 +6,13 @@
 #
 # Manage grub.
 #
+# @param kernel_args Optionally specify kernel args for physical host. Ignored for virtual machines.
+#
 # @example
 #   include nebula::profile::grub
-class nebula::profile::grub {
+class nebula::profile::grub (
+  String $kernel_args = 'console=tty0 console=ttyS1,115200n8 ixgbe.allow_unsupported_sfp=1'
+) {
   if $facts['is_virtual'] and $facts['virtual'] == 'kvm' {
     service { 'getty@hvc0':
       ensure     => 'running',
@@ -53,7 +57,7 @@
         before => Service['serial-getty@ttyS1'],
       ;
       '/etc/default/grub: ^GRUB_CMDLINE_LINUX':
-        line  => 'GRUB_CMDLINE_LINUX="console=tty0 console=ttyS1,115200n8 ixgbe.allow_unsupported_sfp=1"',
+        line  => "GRUB_CMDLINE_LINUX=\"${kernel_args}\"",
         match => '^GRUB_CMDLINE_LINUX=',
       ;
       '/etc/default/grub: ^GRUB_CMDLINE_LINUX_DEFAULT':

Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,13 @@`
`6`	`6`	`#`
`7`	`7`	`# Manage grub.`
`8`	`8`	`#`
	`9`	`+# @param kernel_args Optionally specify kernel args for physical host. Ignored for virtual machines.`
	`10`	`+#`
`9`	`11`	`# @example`
`10`	`12`	`# include nebula::profile::grub`
`11`		`-class nebula::profile::grub {`
	`13`	`+class nebula::profile::grub (`
	`14`	`+ String $kernel_args = 'console=tty0 console=ttyS1,115200n8 ixgbe.allow_unsupported_sfp=1'`
	`15`	`+) {`
`12`	`16`	`if $facts['is_virtual'] and $facts['virtual'] == 'kvm' {`
`13`	`17`	`service { 'getty@hvc0':`
`14`	`18`	`ensure => 'running',`
`@@ -53,7 +57,7 @@`
`53`	`57`	`before => Service['serial-getty@ttyS1'],`
`54`	`58`	`;`
`55`	`59`	`'/etc/default/grub: ^GRUB_CMDLINE_LINUX':`
`56`		`- line => 'GRUB_CMDLINE_LINUX="console=tty0 console=ttyS1,115200n8 ixgbe.allow_unsupported_sfp=1"',`
	`60`	`+ line => "GRUB_CMDLINE_LINUX=\"${kernel_args}\"",`
`57`	`61`	`match => '^GRUB_CMDLINE_LINUX=',`
`58`	`62`	`;`
`59`	`63`	`'/etc/default/grub: ^GRUB_CMDLINE_LINUX_DEFAULT':`