Skip to content
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

Jump to bottom

luminous: ceph-disk: unlocks dmcrypted partitions when activating them #18625

Merged
merged 2 commits into from
Nov 2, 2017
Merged

luminous: ceph-disk: unlocks dmcrypted partitions when activating them #18625

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e9aad1
ceph-disk activate unlocks bluestore data partition
Blackclaws Jul 17, 2017
796e336
ceph-disk: unlock all partitions when activate
tchaikov Aug 30, 2017
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
14 changes: 14 additions & 0 deletions src/ceph-disk/ceph_disk/main.py
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3751,6 +3751,20 @@ def main_activate(args):
)
osd_data = get_mount_point(cluster, osd_id)

args.cluster = cluster
if args.dmcrypt:
for name in Space.NAMES:
# Check if encrypted device in journal
dev_path = os.path.join(osd_data, name + '_dmcrypt')
if not os.path.exists(dev_path):
continue
partition = DevicePartition.factory(
path=None,
dev=dev_path,
args=args)
partition.rawdev = args.path
partition.map()

elif stat.S_ISDIR(mode):
(cluster, osd_id) = activate_dir(
path=args.path,
Expand Down