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

ceph-disk: ability to use a different cluster name with dmcrypt #11786

Merged
2 commits merged into from Feb 17, 2017
Merged

ceph-disk: ability to use a different cluster name with dmcrypt #11786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d98d4db
ceph-disk: Adding cluster name support for dmcrypt
Nov 15, 2016
1c74747
ceph-disk: change get_dmcrypt_key test to support different cluster name
leseb Jan 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
35 changes: 25 additions & 10 deletions src/ceph-disk/ceph_disk/main.py
View file
Open in desktop
Expand Up @@ -1161,8 +1161,10 @@ def get_dmcrypt_key_path(
def get_dmcrypt_key(
_uuid,
key_dir,
luks
luks,
cluster
):

legacy_path = get_dmcrypt_key_path(_uuid, key_dir, luks)
if os.path.exists(legacy_path):
return (legacy_path,)
Expand All @@ -1174,6 +1176,8 @@ def get_dmcrypt_key(
key, stderr, ret = command(
[
'ceph',
'--cluster',
cluster,
'--name',
'client.osd-lockbox.' + osd_uuid,
'--keyring',
Expand Down Expand Up @@ -1739,7 +1743,7 @@ def setup_crypt(self):

self.osd_dm_key = get_dmcrypt_key(
self.get_uuid(), self.args.dmcrypt_key_dir,
False)
False, self.args.cluster)

def set_variables_ptype(self):
self.ptype_map = PTYPE['plain']
Expand All @@ -1765,7 +1769,7 @@ def setup_crypt(self):

self.osd_dm_key = get_dmcrypt_key(
self.get_uuid(), self.args.dmcrypt_key_dir,
True)
True, self.args.cluster)

def set_variables_ptype(self):
self.ptype_map = PTYPE['luks']
Expand Down Expand Up @@ -2474,6 +2478,8 @@ def create_key(self):
'ceph',
'--name', 'client.bootstrap-osd',
'--keyring', bootstrap,
'--cluster',
cluster,
'config-key',
'put',
'dm-crypt/osd/' + self.args.osd_uuid + '/luks',
Expand All @@ -2485,6 +2491,8 @@ def create_key(self):
'ceph',
'--name', 'client.bootstrap-osd',
'--keyring', bootstrap,
'--cluster',
cluster,
'auth',
'get-or-create',
'client.osd-lockbox.' + self.args.osd_uuid,
Expand Down Expand Up @@ -3208,7 +3216,7 @@ def dmcrypt_is_mapped(uuid):
return None


def dmcrypt_map(dev, dmcrypt_key_dir):
def dmcrypt_map(dev, dmcrypt_key_dir, cluster):
ptype = get_partition_type(dev)
if ptype in Ptype.get_ready_by_type('plain'):
luks = False
Expand All @@ -3220,7 +3228,7 @@ def dmcrypt_map(dev, dmcrypt_key_dir):
raise Error('--dmcrypt called for dev %s with invalid ptype %s'
% (dev, ptype))
part_uuid = get_partition_uuid(dev)
dmcrypt_key = get_dmcrypt_key(part_uuid, dmcrypt_key_dir, luks)
dmcrypt_key = get_dmcrypt_key(part_uuid, dmcrypt_key_dir, luks, cluster)
return _dmcrypt_map(
rawdev=dev,
key=dmcrypt_key,
Expand All @@ -3237,12 +3245,13 @@ def mount_activate(
init,
dmcrypt,
dmcrypt_key_dir,
cluster,
reactivate=False,
):

if dmcrypt:
part_uuid = get_partition_uuid(dev)
dev = dmcrypt_map(dev, dmcrypt_key_dir)
dev = dmcrypt_map(dev, dmcrypt_key_dir, cluster)
try:
fstype = detect_fstype(dev=dev)
except (subprocess.CalledProcessError,
Expand Down Expand Up @@ -3540,6 +3549,7 @@ def main_activate(args):
init=args.mark_init,
dmcrypt=args.dmcrypt,
dmcrypt_key_dir=args.dmcrypt_key_dir,
cluster=args.cluster,
reactivate=args.reactivate,
)
osd_data = get_mount_point(cluster, osd_id)
Expand Down Expand Up @@ -3777,7 +3787,7 @@ def _deallocate_osd_id(cluster, osd_id):
])


def _remove_lockbox(uuid):
def _remove_lockbox(uuid, cluster):
command([
'ceph',
'auth',
Expand All @@ -3786,6 +3796,8 @@ def _remove_lockbox(uuid):
])
command([
'ceph',
'--cluster',
cluster,
'config-key',
'del',
'dm-crypt/osd/' + uuid + '/luks',
Expand Down Expand Up @@ -3818,7 +3830,8 @@ def destroy_lookup_device(args, predicate, description):
unmap = False
else:
dmcrypt_path = dmcrypt_map(partition['path'],
args.dmcrypt_key_dir)
args.dmcrypt_key_dir,
args.cluster)
unmap = True
list_dev_osd(dmcrypt_path, {}, partition)
if unmap:
Expand Down Expand Up @@ -3883,7 +3896,7 @@ def main_destroy_locked(args):
for name in Space.NAMES:
if target_dev.get(name + '_uuid'):
dmcrypt_unmap(target_dev[name + '_uuid'])
_remove_lockbox(target_dev['uuid'])
_remove_lockbox(target_dev['uuid'], args.cluster)

# Check zap flag. If we found zap flag, we need to find device for
# destroy this osd data.
Expand Down Expand Up @@ -3937,7 +3950,7 @@ def main_activate_space(name, args):
dev = None
with activate_lock:
if args.dmcrypt:
dev = dmcrypt_map(args.dev, args.dmcrypt_key_dir)
dev = dmcrypt_map(args.dev, args.dmcrypt_key_dir, args.cluster)
else:
dev = args.dev
# FIXME: For an encrypted journal dev, does this return the
Expand All @@ -3963,6 +3976,7 @@ def main_activate_space(name, args):
init=args.mark_init,
dmcrypt=args.dmcrypt,
dmcrypt_key_dir=args.dmcrypt_key_dir,
cluster=args.cluster,
reactivate=args.reactivate,
)

Expand Down Expand Up @@ -4006,6 +4020,7 @@ def main_activate_all(args):
activate_key_template=args.activate_key_template,
init=args.mark_init,
dmcrypt=False,
cluster=args.cluster,
dmcrypt_key_dir='',
)
start_daemon(
Expand Down
2 changes: 1 addition & 1 deletion src/ceph-disk/tests/test_prepare.py
View file
Open in desktop
Expand Up @@ -316,7 +316,7 @@ def get_conf(**kwargs):
partition.map()
assert m['_dmcrypt_map'].called
m['get_dmcrypt_key'].assert_called_with(
uuid, '/etc/ceph/dmcrypt-keys', True)
uuid, '/etc/ceph/dmcrypt-keys', True, 'ceph')


class TestCryptHelpers(Base):
Expand Down