Moving 'sysctl::appliance' to 'nodo::subsystem::sysctl::appliance'

diff --git a/manifests/base/appliance.pp b/manifests/base/appliance.pp
index 73d95f5e9ee7e37b2ff618b7b9ff736e57da6075..303247997816eee9787841ba5562c372c046dea6 100644 (file)
--- a/manifests/base/appliance.pp
+++ b/manifests/base/appliance.pp
@@ -1,5 +1,5 @@
 class nodo::base::appliance inherits nodo::base::physical {
-  class { 'sysctl::appliance': }
+  class { 'nodo::subsystem::sysctl::appliance': }
 
   class { [ 'nodo::subsystem::fstab', 'nodo::subsystem::crypttab' ]:
     type => 'appliance',

diff --git a/manifests/subsystem/sysctl.pp b/manifests/subsystem/sysctl.pp
index 1df0348636a0b2c081b0783ff5e94a4d00d7018a..03e1683117210815e1f0e68f6767528c53ecd6fc 100644 (file)
--- a/manifests/subsystem/sysctl.pp
+++ b/manifests/subsystem/sysctl.pp
@@ -38,18 +38,3 @@ class nodo::subsystem::sysctl {
     refreshonly => true,
   }
 }
-
-class sysctl::appliance($kernel_panic = hiera('nodo::sysctl::appliance', '20')) {
-  file { "/etc/sysctl.d/kernel.panic.conf":
-    owner   => "root",
-    group   => "root",
-    mode    => 0644,
-    ensure  => present,
-    content => "kernel.panic = ${kernel_panic}\n",
-  }
-
-  exec { "/bin/echo '${kernel_panic}' > /proc/sys/kernel/panic":
-    subscribe   => File["/etc/sysctl.d/kernel.panic.conf"],
-    refreshonly => true,
-  }
-}

diff --git a/manifests/subsystem/sysctl/appliance.pp b/manifests/subsystem/sysctl/appliance.pp
new file mode 100644 (file)
index 0000000..83c151c
--- /dev/null
+++ b/manifests/subsystem/sysctl/appliance.pp
@@ -0,0 +1,14 @@
+class nodo::subsystem::sysctl::appliance($kernel_panic = hiera('nodo::sysctl::appliance', '20')) {
+  file { "/etc/sysctl.d/kernel.panic.conf":
+    owner   => "root",
+    group   => "root",
+    mode    => 0644,
+    ensure  => present,
+    content => "kernel.panic = ${kernel_panic}\n",
+  }
+
+  exec { "/bin/echo '${kernel_panic}' > /proc/sys/kernel/panic":
+    subscribe   => File["/etc/sysctl.d/kernel.panic.conf"],
+    refreshonly => true,
+  }
+}