aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-06-02 21:23:53 -0300
committerSilvio Rhatto <rhatto@riseup.net>2013-06-02 21:23:53 -0300
commitd3e11f88f27609ca199bf1263348a466e909ff78 (patch)
treeaef4c0d60120bfb2846b943d7bdbc270d5a0d939
parentea446b2831732689a125c34169e142851e15cb43 (diff)
downloadpuppet-nodo-d3e11f88f27609ca199bf1263348a466e909ff78.tar.gz
puppet-nodo-d3e11f88f27609ca199bf1263348a466e909ff78.tar.bz2
Moving 'sysctl::appliance' to 'nodo::subsystem::sysctl::appliance'
-rw-r--r--manifests/base/appliance.pp2
-rw-r--r--manifests/subsystem/sysctl.pp15
-rw-r--r--manifests/subsystem/sysctl/appliance.pp14
3 files changed, 15 insertions, 16 deletions
diff --git a/manifests/base/appliance.pp b/manifests/base/appliance.pp
index 73d95f5..3032479 100644
--- 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 1df0348..03e1683 100644
--- 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
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,
+ }
+}