dc8657e203
This changes the puppet-lint requirement to 1.1.x, so that we can use puppet-lint plugins. Most of these plugins are for 4.x compat, but some just catch common errors. Change-Id: I9b41f170a782fecf88f241dc12288670b552b433
75 lines
2.0 KiB
Puppet
75 lines
2.0 KiB
Puppet
#
|
|
# Usage
|
|
# swift::storage::mount
|
|
#
|
|
#
|
|
define swift::storage::mount(
|
|
$device,
|
|
$mnt_base_dir = '/srv/node',
|
|
$loopback = false,
|
|
$fstype = 'xfs'
|
|
) {
|
|
|
|
if($loopback){
|
|
$options = 'noatime,nodiratime,nobarrier,loop'
|
|
} else {
|
|
$options = 'noatime,nodiratime,nobarrier'
|
|
}
|
|
|
|
if($fstype == 'xfs'){
|
|
$fsoptions = 'logbufs=8'
|
|
} else {
|
|
$fsoptions = 'user_xattr'
|
|
}
|
|
|
|
# the directory that represents the mount point
|
|
# needs to exist
|
|
file { "${mnt_base_dir}/${name}":
|
|
ensure => directory,
|
|
owner => 'swift',
|
|
group => 'swift',
|
|
}
|
|
|
|
mount { "${mnt_base_dir}/${name}":
|
|
ensure => present,
|
|
device => $device,
|
|
fstype => $fstype,
|
|
options => "${options},${fsoptions}",
|
|
require => File["${mnt_base_dir}/${name}"],
|
|
}
|
|
|
|
# double checks to make sure that things are mounted
|
|
exec { "mount_${name}":
|
|
command => "mount ${mnt_base_dir}/${name}",
|
|
path => ['/bin'],
|
|
require => Mount["${mnt_base_dir}/${name}"],
|
|
unless => "grep ${mnt_base_dir}/${name} /etc/mtab",
|
|
# TODO - this needs to be removed when I am done testing
|
|
logoutput => true,
|
|
}
|
|
|
|
exec { "fix_mount_permissions_${name}":
|
|
command => "chown -R swift:swift ${mnt_base_dir}/${name}",
|
|
path => ['/usr/sbin', '/bin'],
|
|
subscribe => Exec["mount_${name}"],
|
|
refreshonly => true,
|
|
}
|
|
|
|
# mounting in linux and puppet is broken and non-atomic
|
|
# we have to mount, check mount with executing command,
|
|
# fix ownership and on selinux systems fix context.
|
|
# It would be definetly nice if passing options uid=,gid=
|
|
# would be possible as context is. But, as there already is
|
|
# chown command we'll just restorecon on selinux enabled
|
|
# systems :(
|
|
if ($::selinux == 'true') {
|
|
exec { "restorecon_mount_${name}":
|
|
command => "restorecon ${mnt_base_dir}/${name}",
|
|
path => ['/usr/sbin', '/sbin'],
|
|
subscribe => Exec["mount_${name}"],
|
|
before => Exec["fix_mount_permissions_${name}"],
|
|
refreshonly => true,
|
|
}
|
|
}
|
|
}
|