]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
ceph-disk: dmcrypt activate must use the same cluster as prepare 14765/head
authorLoic Dachary <ldachary@redhat.com>
Wed, 22 Feb 2017 00:49:12 +0000 (01:49 +0100)
committerNathan Cutler <ncutler@suse.com>
Tue, 25 Apr 2017 06:46:29 +0000 (08:46 +0200)
commit43327f83efcbc5ce54be866a30da8dd1e58d6707
tree79c8ba822a0ea836130133ccfe29a76d91f32108
parent82b8c89e477610641a6e21123b7c929e9c560729
ceph-disk: dmcrypt activate must use the same cluster as prepare

When dmcrypt is used, the fsid cannot be retrieved from the data
partition because it is encrypted. Store the fsid in the lockbox to
enable dmcrypt activation using the same logic as regular activation.

The fsid is used to retrive the cluster name that was used during
prepare, reason why activation does not and must not have a --cluster
argument.

Fixes: http://tracker.ceph.com/issues/17821
Signed-off-by: Loic Dachary <ldachary@redhat.com>
(cherry picked from commit 7f66672b675abbc0262769d32a38112c781fefac)

Conflicts:
        src/ceph-disk/ceph_disk/main.py - in master, self.create_key() takes an
            argument (self.args.cluster) but in jewel it takes no argument
src/ceph-disk/ceph_disk/main.py