Merge "Fix disk mount options"
This commit is contained in:
commit
f847dae469
|
@ -31,9 +31,9 @@ define swift::storage::mount(
|
||||||
include swift::deps
|
include swift::deps
|
||||||
|
|
||||||
if($loopback){
|
if($loopback){
|
||||||
$options = 'noatime,nodiratime,nobarrier,loop'
|
$options = 'noatime,nodiratime,nofail,loop'
|
||||||
} else {
|
} else {
|
||||||
$options = 'noatime,nodiratime,nobarrier'
|
$options = 'noatime,nodiratime,nofail'
|
||||||
}
|
}
|
||||||
|
|
||||||
if($fstype == 'xfs'){
|
if($fstype == 'xfs'){
|
||||||
|
|
|
@ -0,0 +1,8 @@
|
||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
The nobarrier XFS mount option is removed from kernel 4.19.0 and beyond.
|
||||||
|
It has no effect on kernel 4.10.0. Therefore, it is now removed from the
|
||||||
|
default mount options.
|
||||||
|
Also, puppet-swift now adds the nofail option, so that a swift store node
|
||||||
|
finishes to boot even if an HDD mount is failed.
|
|
@ -19,7 +19,7 @@ describe 'swift::storage::mount' do
|
||||||
:ensure => 'present',
|
:ensure => 'present',
|
||||||
:device => '/dev/sda',
|
:device => '/dev/sda',
|
||||||
:fstype => 'xfs',
|
:fstype => 'xfs',
|
||||||
:options => 'noatime,nodiratime,nobarrier,logbufs=8',
|
:options => 'noatime,nodiratime,nofail,logbufs=8',
|
||||||
)}
|
)}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -33,7 +33,7 @@ describe 'swift::storage::mount' do
|
||||||
|
|
||||||
it { is_expected.to contain_mount('/srv/node/dans_mount_point').with(
|
it { is_expected.to contain_mount('/srv/node/dans_mount_point').with(
|
||||||
:device => '/dev/sda',
|
:device => '/dev/sda',
|
||||||
:options => 'noatime,nodiratime,nobarrier,loop,logbufs=8'
|
:options => 'noatime,nodiratime,nofail,loop,logbufs=8'
|
||||||
)}
|
)}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue