]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
ceph-disk: dmcrypt activate must use the same cluster as prepare 13497/head
authorLoic Dachary <ldachary@redhat.com>
Wed, 22 Feb 2017 00:49:12 +0000 (01:49 +0100)
committerShinobu Kinjo <shinobu@redhat.com>
Fri, 24 Feb 2017 21:21:35 +0000 (06:21 +0900)
commit6b3655fe4bd3c493e6b10dd597d791a5b572df2b
tree3c314cdfbef75d202f4dfb4f95cfcec04c140cf4
parent16fc6d8a2af89bb8a620298729d3951ef32945f7
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
src/ceph-disk/ceph_disk/main.py