From bb85c667cc2a7029dfb6c0f270260473327b64b5 Mon Sep 17 00:00:00 2001 From: Dan Bode Date: Mon, 23 Jul 2012 15:05:21 -0700 Subject: [PATCH] Style related updates This commit contains several style related updates: - aligns class parameters for readibility - removes trailing class params for 2.6.x compat - deletes accidentally checked in swp file --- manifests/storage/.mount.pp.swp | Bin 12288 -> 0 bytes manifests/storage/loopback.pp | 8 ++++---- manifests/storage/mount.pp | 2 +- manifests/storage/xfs.pp | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 manifests/storage/.mount.pp.swp diff --git a/manifests/storage/.mount.pp.swp b/manifests/storage/.mount.pp.swp deleted file mode 100644 index 89b41e766b923c991a0dac18b5ddfa8fb5a752a5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2zi%T&6vyXiK)}HPqD2qe$QQ}Z=5h#5mXZpPQk){8JDLcE{qfcw#XGa?%qB5b z#J|8lKm`pI)RdI`0e}z{#T8VDf)eqa-L*M%=OYzTq_@^LJ3I4c-g}>Uj)`@b&hifQ4;>1=l#@7&sK9kEZNvMx*ZQDL)s z&MtCiI>%FNbk5G>+1o0fGRAA;x65+#YBC}OgutZ<)IJ~Ixvp;S-r5Os`n}ibm6z{d zdb$`20U;m+gn$qb0zyCt2mv8*^$Ga$n)(!JJk_Pryd0o?t$SYGyGOYR0U;m+gn$qb z0zyCt2mv7=1cZPP5CT__K%6Oc?^&gGo4xn9V8yZ8;K)+wdn$UO9SI{TWDO5xI&;a`5d8K}Y zzJxS1f?kDQf^I+$5c3z%0y>1=f_9-Mmn*mz60#5w0zyCt2mv7=1cboG6UI82`|dfXN4@4e>+xV|;({-FAGVfd>}N1) zE?6E7quN!GOSBn|Xc&ciXPMdpXJoULWiOrCGehI|sX0G8Y5vk+Sr~tu#Ey?MU0p;g zZ^0QO3R+Sx*XPG=EG1Wkc1~O4)^SY~Oj`nTJGHehYv1MHCD*5WhwmKHnEXsTGR&DH zZwbj(T-a02=xoM@4k#`tvxdpzSg$rytV>iI9Qk#jg=~A%ipxzgQ*&0h@Nv>>QC0kL zt*Z{{-EcVgsJAKKN9eX}AB!^t((u?6N#lP-@87#PQAB-YStoO*bjImP!=i{!m|Tru z{VetYl$kn;@!U*jym74{ud+fE@98-|Atg*9vZW8(73dARc1tIBeo+Dr28QRk8@9a} zpX#*j9klJXpG^~8ur5*MY<%c%DWF6)VST7Lrj@PB)?HJ2okP?lSC4jg{@@N}$tg~F zFM`7y8HbYG>@VP5ml&UG=P|7hqWsTFEo78Zn+bLRqirsw)h5hn3wlM2_GoBq>~+B- zV-eA+nZ#A4xf-GJlR9^McZOju@!TOyG-(a}@=IVbTZVOXesd7oNt~W+E!9@D;<^V5 z<}v&PEQ5!?#KBYKs?!LOazlB&lNsk4->>!`z@$4jKbbVC-&FnZLCB9C#>jn#Q}(d= E8!q$EMgRZ+ diff --git a/manifests/storage/loopback.pp b/manifests/storage/loopback.pp index 401fea1d..fa336e34 100644 --- a/manifests/storage/loopback.pp +++ b/manifests/storage/loopback.pp @@ -7,10 +7,10 @@ # - formats the file to be an xfs device and mounts it as a loopback device at /srv/node/$name # - sets up each mount point as a swift endpoint define swift::storage::loopback( - $base_dir = '/srv/loopback-device', + $base_dir = '/srv/loopback-device', $mnt_base_dir = '/srv/node', - $byte_size = '1024', - $seek = '25000' + $byte_size = '1024', + $seek = '25000' ) { if(!defined(File[$base_dir])) { @@ -39,7 +39,7 @@ define swift::storage::loopback( mnt_base_dir => $mnt_base_dir, byte_size => $byte_size, subscribe => Exec["create_partition-${name}"], - loopback => true, + loopback => true, } } diff --git a/manifests/storage/mount.pp b/manifests/storage/mount.pp index eb43380f..89127ccb 100644 --- a/manifests/storage/mount.pp +++ b/manifests/storage/mount.pp @@ -6,7 +6,7 @@ define swift::storage::mount( $device, $mnt_base_dir = '/srv/node', - $loopback = false, + $loopback = false ) { if($loopback){ $options = 'noatime,nodiratime,nobarrier,logbufs=8,loop' diff --git a/manifests/storage/xfs.pp b/manifests/storage/xfs.pp index 67173552..b0a9ea36 100644 --- a/manifests/storage/xfs.pp +++ b/manifests/storage/xfs.pp @@ -12,9 +12,9 @@ # It is recommened to use 1024 to ensure that the metadata can fit in a single inode. define swift::storage::xfs( $device, - $byte_size = '1024', + $byte_size = '1024', $mnt_base_dir = '/srv/node', - $loopback = false, + $loopback = false ) { include swift::xfs