openstack
/
charm-swift-storage
Code Issues Proposed changes

Add nofail to fstab options for loop dev 

Some machines will not boot if nofail is excluded

Change-Id: Ib978709943c4aec8f7d405c0b71e1c4d81f3764c
Closes-Bug: 1768666
This commit is contained in:
Andrew McLeod 2018-05-21 10:41:32 -06:00
parent b03a8bc5bd
commit 0598fd20fb
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/swift_storage_utils.py
View File

@ -541,7 +541,7 @@ def setup_storage(encrypt=False):
fstab_entry = fstab.get_entry_by_attr('mountpoint', mountpoint)
if fstab_entry and loopback_device == fstab_entry.device:
dev = loopback_device
options = "loop,defaults"
options = "loop,nofail,defaults"
filesystem = "xfs"

4
unit_tests/test_swift_storage_utils.py
View File

@ -513,7 +513,7 @@ class SwiftStorageUtilsTests(CharmTestCase):
'/dev/loop0',
'/srv/node/loop0',
'xfs',
options='loop,defaults'
options='loop,nofail,defaults'
)
self.mkdir.assert_has_calls([
@ -556,7 +556,7 @@ class SwiftStorageUtilsTests(CharmTestCase):
'/srv/test.img',
'/srv/node/loop0',
'xfs',
options='loop,defaults'
options='loop,nofail,defaults'
)
self.mkdir.assert_has_calls([