Skip to content

[pull] master from ceph:master #212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Sep 23, 2019
+2 −1
Merged

[pull] master from ceph:master #212

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80d3e4c
ceph-volume: do not fail when trying to remove crypt mapper
guits Sep 20, 2019
4d23ccb
Merge pull request #30490 from ceph/guits-41392
Sep 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/ceph-volume/ceph_volume/util/encryption.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,8 @@ def dmcrypt_close(mapping):
logger.debug('device mapper path does not exist %s' % mapping)
logger.debug('will skip cryptsetup removal')
return
process.run(['cryptsetup', 'remove', mapping])
# don't be strict about the remove call, but still warn on the terminal if it fails
process.run(['cryptsetup', 'remove', mapping], stop_on_error=False)


def get_dmcrypt_key(osd_id, osd_fsid, lockbox_keyring=None):
Expand Down