diff --git a/site-modules/profile/manifests/mountpoints.pp b/site-modules/profile/manifests/mountpoints.pp index 63f9df43..aa53185f 100644 --- a/site-modules/profile/manifests/mountpoints.pp +++ b/site-modules/profile/manifests/mountpoints.pp @@ -1,37 +1,32 @@ # Handle mount points class profile::mountpoints { $mountpoints = lookup('mountpoints', Hash, 'deep') each($mountpoints) |$mountpoint, $config| { if (has_key($config, 'options') and $config['options'] =~ Array) { $mount_config = $config + { options => join($config['options'], ','), } } else { $mount_config = $config } - if pick($config['ensure'], 'present') == 'present' { + if pick($config['ensure'], 'present') != 'absent' { exec {"create ${mountpoint}": creates => $mountpoint, command => "mkdir -p ${mountpoint}", path => ['/bin', '/usr/bin', '/sbin', '/usr/sbin'], - } -> file {$mountpoint:} - - $requires = [File[$mountpoint]] - } else { - $requires = [] - } - - mount { - default: - ensure => present, - dump => 0, - pass => 0, - options => 'defaults'; - $mountpoint: - * => $mount_config, - require => $requires, + } + -> file {$mountpoint:} + -> mount { + default: + ensure => present, + dump => 0, + pass => 0, + options => 'defaults'; + $mountpoint: + * => $mount_config, + } } } }