diff options
| author | James Shubin <james@shubin.ca> | 2013-08-20 05:22:37 -0400 |
|---|---|---|
| committer | James Shubin <james@shubin.ca> | 2013-08-20 05:22:37 -0400 |
| commit | 89dd93ee8703eea4274ee08e43d16178f152423b (patch) | |
| tree | 7141b85d110d489dfd8e34113951353a5f54804a /manifests | |
| parent | 94454ea365fb1f97eeb3f81759ae6e33567971aa (diff) | |
| download | puppet-gluster-89dd93ee8703eea4274ee08e43d16178f152423b.tar.gz puppet-gluster-89dd93ee8703eea4274ee08e43d16178f152423b.tar.xz puppet-gluster-89dd93ee8703eea4274ee08e43d16178f152423b.zip | |
Small cleanups.
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/brick.pp | 2 | ||||
| -rw-r--r-- | manifests/client.pp | 2 | ||||
| -rw-r--r-- | manifests/client/base.pp | 15 |
3 files changed, 12 insertions, 7 deletions
diff --git a/manifests/brick.pp b/manifests/brick.pp index 3cc5998..b4aaf1d 100644 --- a/manifests/brick.pp +++ b/manifests/brick.pp @@ -154,7 +154,7 @@ define gluster::brick( # make an empty directory for the mount point file { "${mount}": ensure => directory, # make sure this is a directory - recurse => false, # don't recurse into directory + recurse => false, # don't recurse into directory purge => false, # don't purge unmanaged files force => false, # don't purge subdirs and links require => Exec["gluster-brick-make-${name}"], diff --git a/manifests/client.pp b/manifests/client.pp index ea1dc39..559cafa 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -45,7 +45,7 @@ define gluster::client( # make an empty directory for the mount point file { "${name}": ensure => directory, # make sure this is a directory - recurse => false, # don't recurse into directory + recurse => false, # don't recurse into directory purge => false, # don't purge unmanaged files force => false, # don't purge subdirs and links } diff --git a/manifests/client/base.pp b/manifests/client/base.pp index 0545c99..0d3866c 100644 --- a/manifests/client/base.pp +++ b/manifests/client/base.pp @@ -22,18 +22,23 @@ class gluster::client::base { } # FIXME: choose a reliable and correct way to ensure fuse is loaded - #[root@test2 ~]# dmesg | grep -i fuse - #[root@test2 ~]# modprobe fuse - #[root@test2 ~]# dmesg | grep -i fuse + # dmesg | grep -i fuse + # modprobe fuse + # dmesg | grep -i fuse #fuse init (API version 7.13) - #[root@test2 ~]# + # # modprobe fuse if it's missing exec { '/sbin/modprobe fuse': logoutput => on_failure, - onlyif => '/usr/bin/test -z "`/bin/dmesg | grep -i fuse`"', + onlyif => '/usr/bin/test -z "`/bin/dmesg | /bin/grep -i fuse`"', alias => 'gluster-fuse', } + #exec { '/sbin/modprobe fuse': + # logoutput => on_failure, + # unless => "/sbin/lsmod | /bin/grep -q '^fuse'", + # alias => 'gluster-modprobe-fuse', + #} # TODO: will this autoload the fuse module? #file { '/etc/modprobe.d/fuse.conf': |