summaryrefslogtreecommitdiffstats
path: root/manifests/mount.pp
diff options
context:
space:
mode:
authorJames Shubin <james@shubin.ca>2014-04-29 04:09:05 -0400
committerJames Shubin <james@shubin.ca>2014-05-07 12:52:05 -0400
commite1d3c37ba58ace9bbdd00911b2e47c645f7f18b7 (patch)
tree08e70fa0e4f10c1591d580913079eb0d0d5e8b8d /manifests/mount.pp
parent9722c0515848670d642e21a220aca37f67b65492 (diff)
downloadpuppet-gluster-e1d3c37ba58ace9bbdd00911b2e47c645f7f18b7.tar.gz
puppet-gluster-e1d3c37ba58ace9bbdd00911b2e47c645f7f18b7.tar.xz
puppet-gluster-e1d3c37ba58ace9bbdd00911b2e47c645f7f18b7.zip
Add Debian/Ubuntu specific packaging changes.
Diffstat (limited to 'manifests/mount.pp')
-rw-r--r--manifests/mount.pp12
1 files changed, 8 insertions, 4 deletions
diff --git a/manifests/mount.pp b/manifests/mount.pp
index 4e28576..2e842b1 100644
--- a/manifests/mount.pp
+++ b/manifests/mount.pp
@@ -142,6 +142,13 @@ define gluster::mount(
alias => "${short_name}", # don't allow duplicates name's
}
+ $packages = "${::gluster::params::package_glusterfs_fuse}" ? {
+ '' => ["${::gluster::params::package_glusterfs}"],
+ default => [
+ "${::gluster::params::package_glusterfs}",
+ "${::gluster::params::package_glusterfs_fuse}",
+ ],
+ }
# Mount Options:
# * backupvolfile-server=server-name
# * fetch-attempts=N (where N is number of attempts)
@@ -163,10 +170,7 @@ define gluster::mount(
dump => '0', # fs_freq: 0 to skip file system dumps
pass => '0', # fs_passno: 0 to skip fsck on boot
require => [
- Package[
- ["${::gluster::params::package_glusterfs}",
- "${::gluster::params::package_glusterfs_fuse}"]
- ],
+ Package[$packages],
File["${long_name}"], # the mountpoint
Exec['gluster-fuse'], # ensure fuse is loaded!
],