aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2016-03-05 15:58:49 -0300
committerSilvio Rhatto <rhatto@riseup.net>2016-03-05 15:58:49 -0300
commit21a6098b8f6c2696b41597af11326f3bc6632930 (patch)
tree03662bb5acfe88681bb845c06c0254025adfc0b2
parent858482592039b4ef0dc8f80c7c4809f23cdf010a (diff)
downloadpuppet-nodo-21a6098b8f6c2696b41597af11326f3bc6632930.tar.gz
puppet-nodo-21a6098b8f6c2696b41597af11326f3bc6632930.tar.bz2
Cleanup: fstab and crypttab
-rw-r--r--manifests/base.pp4
-rw-r--r--manifests/base/server.pp4
2 files changed, 1 insertions, 7 deletions
diff --git a/manifests/base.pp b/manifests/base.pp
index f0a05d7..aaeabec 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -1,6 +1,4 @@
-class nodo::base(
- $puppet_mode = hiera('nodo::base::puppet_mode', 'daemon')
-){
+class nodo::base {
# First include the LSB class
include lsb
diff --git a/manifests/base/server.pp b/manifests/base/server.pp
index 2281340..97bd584 100644
--- a/manifests/base/server.pp
+++ b/manifests/base/server.pp
@@ -1,7 +1,3 @@
class nodo::base::server inherits nodo::base::physical {
- class { [ 'nodo::subsystem::fstab', 'nodo::subsystem::crypttab' ]:
- type => 'server',
- }
-
include nodo::utils::storage::layer
}