openstack/puppet-swift
Code Issues Proposed changes

updated loopback, xfs, and mount to support non-loopback devices

Browse Source
This commit is contained in:
Robert Starmer
2012-06-26 16:24:06 -07:00
parent cfc0730556
commit 1841771355
4 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
manifests/storage/.mount.pp.swp Normal file
View File

Binary file not shown.

1
manifests/storage/loopback.pp
View File

@@ -39,6 +39,7 @@ define swift::storage::loopback(
mnt_base_dir => $mnt_base_dir, mnt_base_dir => $mnt_base_dir,
byte_size => $byte_size, byte_size => $byte_size,
subscribe => Exec["create_partition-${name}"], subscribe => Exec["create_partition-${name}"],
loopback => true,
} }
} }

11
manifests/storage/mount.pp
View File

@@ -5,9 +5,14 @@
# #
define swift::storage::mount( define swift::storage::mount(
$device, $device,
$mnt_base_dir = '/srv/node' $mnt_base_dir = '/srv/node',
$loopback = false,
) { ) {
if($loopback){
$options = 'noatime,nodiratime,nobarrier,logbufs=8,loop'
} else {
$options = 'noatime,nodiratime,nobarrier,logbufs=8'
}
# the directory that represents the mount point # the directory that represents the mount point
# needs to exist # needs to exist
file { "${mnt_base_dir}/${name}": file { "${mnt_base_dir}/${name}":
@@ -20,7 +25,7 @@ define swift::storage::mount(
ensure => present, ensure => present,
device => $device, device => $device,
fstype => 'xfs', fstype => 'xfs',
options => 'loop,noatime,nodiratime,nobarrier,logbufs=8', options => $options,
require => File["${mnt_base_dir}/${name}"] require => File["${mnt_base_dir}/${name}"]
} }

6
manifests/storage/xfs.pp
View File

@@ -13,7 +13,8 @@
define swift::storage::xfs( define swift::storage::xfs(
$device, $device,
$byte_size = '1024', $byte_size = '1024',
$mnt_base_dir = '/srv/node' $mnt_base_dir = '/srv/node',
$loopback = false,
) { ) {
include swift::xfs include swift::xfs
@@ -29,7 +30,8 @@ define swift::storage::xfs(
swift::storage::mount { $name: swift::storage::mount { $name:
device => $device, device => $device,
mnt_base_dir => $mnt_base_dir, mnt_base_dir => $mnt_base_dir,
subscribe => Exec["mkfs-${name}"] subscribe => Exec["mkfs-${name}"],
loopback => $loopback,
} }
} }