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

leseb · 2016-11-04T15:04:52Z

Prior to this commit we were not able to configure an OSD using dmcrypt
on a cluster with a different name than 'ceph'. Adding the command line
option to --cluster to fix this.

Signed-off-by: Sébastien Han seb@redhat.com

alfredodeza · 2016-11-04T15:53:03Z

src/ceph-disk/ceph_disk/main.py

@@ -2377,13 +2379,14 @@ def set_or_create_partition(self):
                      self.args.lockbox)
            self.partition = self.create_partition()

-    def create_key(self):
+    def create_key(self, cluster):


there is no need for requiring cluster here, you can rely on self.args since that will have the arguments passed in:

self.args.cluster

alfredodeza · 2016-11-04T15:53:33Z

src/ceph-disk/ceph_disk/main.py

        key_size = CryptHelpers.get_dmcrypt_keysize(self.args)
        key = open('/dev/urandom', 'rb').read(key_size / 8)
        base64_key = base64.b64encode(key)
        command_check_call(
            [
                'ceph',
+                '--cluster', cluster,


you would be able to just use that self.args.cluster in here, which already defaults to ceph if not explicitly defined

ktdreyer · 2016-11-04T17:52:43Z

Would you please file a ticket at http://tracker.ceph.com for this, and add the URL of the ticket to the commit log, so we can track this and ensure it is backported to Jewel eventually?

leseb · 2016-11-08T13:34:53Z

@ktdreyer sure, see: http://tracker.ceph.com/issues/17821

leseb · 2016-11-08T13:35:47Z

I'll update the PR with a definitive fix today.

tchaikov · 2016-11-14T02:21:03Z

@leseb could you put the line of Fixes: http://tracker.ceph.com/issues/17821 into your commit message? right before your "SIgned-off-by" line, see https://github.com/ceph/ceph/blob/master/SubmittingPatches.rst#tag-the-commit .

leseb · 2016-11-14T13:12:11Z

@tchaikov just did, thanks!
I still have some work to do on that patch.

ktdreyer · 2016-11-14T16:17:50Z

Please remove "DNM" from the title when this PR is ready for review and merging.

leseb · 2016-11-15T15:30:59Z

@ErwanAliasr1 and I reworked the patch, ready for review now :)

ErwanAliasr1 · 2016-11-16T21:21:46Z

WDYT about this patch series guys ?

ktdreyer · 2016-11-16T21:23:37Z

Would you please rebase this onto the latest master to ensure that Jenkins is happy with it?

leseb · 2016-11-16T21:45:18Z

@ktdreyer done

ghost · 2016-11-17T00:18:09Z

this needs rebasing (and the test fails)

ghost · 2016-11-17T00:26:19Z

src/ceph-disk/ceph_disk/main.py

+        metavar='NAME',
+        default='ceph',
+        help='ceph cluster name (default: ceph)',
+    )


Activate does not have a --cluster argument because it can be determined with the find_cluster_by_uuid() function

Alright, let me try again without this, I forgot the error that made us think we needed to do this.

leseb · 2016-11-17T14:25:00Z

Ok testing is blocked by #12033 waiting for the backport to re-validate.

leseb · 2017-02-08T10:54:44Z

@dachary I don't have permission to push a branch to that repo, that's why I created a PR...

ghost · 2017-02-08T11:16:08Z

@leseb you have permission to push, all ceph developers have permission and you're in the group, it must be something on your side that's not configured right.

leseb · 2017-02-08T11:23:42Z

@dachary please see:

$ git remote -v |grep ceph-cii
ceph-cii        git@github.com:ceph/ceph-ci.git (push)
ceph-cii        git@github.com:ceph/ceph-ci.git (fetch)
$ git push ceph-cii dmcrypt-cluster-name
ERROR: Permission to ceph/ceph-ci.git denied to leseb.
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.

Am I doing something wrong?

ghost · 2017-02-08T11:41:58Z

I don't see what's wrong. Here are the permissions you have:

I guess someone with better knowledge of github subtle settings can help out :-)

leseb · 2017-02-08T12:37:49Z

@dachary seems to be working now, branch pushed :)

ghost · 2017-02-08T14:15:58Z

@leseb nice :-) What was the problem ? Do you have access to the sepia lab ?

leseb · 2017-02-08T14:18:43Z

@dachary well looks like I wasn't part of Ceph team, then I got an email saying you added me and it was good :).

ghost · 2017-02-08T14:26:47Z

well looks like I wasn't part of Ceph team, then I got an email saying you added me and it was good :).

Oo amazing. I was looking to verify if you were listed and mistook the "add" box for the "search" box... happy ending :-) Welcome to the Ceph team, always nice to have new members ...

yuriw · 2017-02-16T00:35:18Z

@leseb @dachary @GregMeno
tests failed http://pulpito.front.sepia.ceph.com/yuriw-2017-02-15_21:45:11-ceph-disk-wip-yuri-testing2_2017_2_16-distro-basic-vps/

wip-yuri-testing2_2017_2_16
https://trello.com/c/2NU41k4D

ChristinaMeno · 2017-02-16T05:45:52Z

http://pulpito.ceph.com/yuriw-2017-02-15_21:45:11-ceph-disk-wip-yuri-testing2_2017_2_16-distro-basic-vps/

neurodrone · 2017-02-17T14:17:35Z

Will this be backported to Jewel by any chance?

vumrao · 2017-02-17T14:35:02Z

@neurodrone this is the tracker - http://tracker.ceph.com/issues/17821, it was marked backport to jewel and I have changed it to pending backport. It will get backported to jewel.

With recent changes in ceph (ceph/ceph#11786), this change will allow ceph-deploy osd activate to complete without errors. Follow-on fix for http://tracker.ceph.com/issues/17821 Signed-off-by: Ganesh Mahalingam <ganesh.mahalingam@intel.com>

vasukulkarni · 2017-02-20T19:27:35Z

@dachary it would have been nice to default the cluster to 'ceph' here, we got a patch for ceph-deploy to add the cluster option there, Also would be nice to run ceph-deploy suite for ceph-disk changes as well.

ganeshmaharaj · 2017-02-21T18:26:40Z

@dachary @vasukulkarni Should have updated both threads. #13527 is the patch submitted to ceph-disk to add the default.

ghost · 2017-02-21T20:02:20Z

@leseb I was wrong merging this pull request. I misread #11786 (comment) and thought the tests were successfull. Instead they failed and as a result ceph-disk is now broken in master. Could you please fix this asap ?

leseb · 2017-02-21T20:08:22Z

@dachary I originally proposed the same approach as in #13527 so we should merge it.

ghost · 2017-02-21T20:22:21Z

@leseb of course, entirely my fault, please accept my apologies

ganeshmaharaj · 2017-02-21T20:28:34Z

@dachary @leseb Thanks for the update. i believe with this,ceph/ceph-deploy#430 will be needed for ceph-deploy with work. @vasukulkarni

leseb · 2017-02-21T20:41:50Z

@dachary No worries :)

ChristinaMeno · 2017-02-22T00:53:36Z

@leseb @dachary Would you please help me understand the ceph-disk suite failure here?
cheers,
G

ghost · 2017-02-22T05:41:07Z

@GregMeno ceph-disk activate does not have a --cluster argument but the function implementing it expects it. It does not show in the ceph-disk suite output because the part that fails is run via either systemd or udev.

alfredodeza reviewed Nov 4, 2016

View reviewed changes

leseb force-pushed the dmcrypt-cluster-name branch 2 times, most recently from 8b95a96 to 1edc9f8 Compare November 4, 2016 16:06

liewegas added the build/ops label Nov 4, 2016

liewegas added this to the kraken milestone Nov 4, 2016

leseb force-pushed the dmcrypt-cluster-name branch 2 times, most recently from 6ba659e to 2a75124 Compare November 9, 2016 16:24

tchaikov added the feature label Nov 14, 2016

leseb force-pushed the dmcrypt-cluster-name branch from 2a75124 to b45ccb0 Compare November 14, 2016 13:11

ktdreyer changed the title ~~ceph-disk: ability to use a different cluster name with dmcrypt~~ DNM: ceph-disk: ability to use a different cluster name with dmcrypt Nov 14, 2016

leseb force-pushed the dmcrypt-cluster-name branch from b45ccb0 to 8ee40d4 Compare November 15, 2016 15:29

leseb changed the title ~~DNM: ceph-disk: ability to use a different cluster name with dmcrypt~~ ceph-disk: ability to use a different cluster name with dmcrypt Nov 15, 2016

leseb force-pushed the dmcrypt-cluster-name branch from 8ee40d4 to 7fb9560 Compare November 16, 2016 21:45

ghost suggested changes Nov 17, 2016

View reviewed changes

leseb force-pushed the dmcrypt-cluster-name branch from 7fb9560 to c923739 Compare November 17, 2016 10:04

liewegas removed this from the kraken milestone Nov 28, 2016

leseb force-pushed the dmcrypt-cluster-name branch from c923739 to 05dc6e9 Compare December 9, 2016 15:42

yuriw added the wip-yuri2-testing label Feb 15, 2017

yuriw removed the wip-yuri2-testing label Feb 16, 2017

ghost approved these changes Feb 17, 2017

View reviewed changes

ghost merged commit 057e7b1 into ceph:master Feb 17, 2017

This was referenced Feb 20, 2017

Add cluster as an argument for osd activate ceph/ceph-deploy#430

Closed

ceph-disk: Add cluster as an argument to ceph-disk activate #13527

Closed

ghost mentioned this pull request Feb 21, 2017

DNM: ceph-disk: Add cluster as an argument to ceph-disk activate #13566

Closed

ghost mentioned this pull request Feb 21, 2017

ceph-disk: dmcrypt activate must use the same cluster as prepare #13573

Merged

This pull request was closed.

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

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

Conversation

leseb commented Nov 4, 2016

alfredodeza Nov 4, 2016

Choose a reason for hiding this comment

alfredodeza Nov 4, 2016

Choose a reason for hiding this comment

ktdreyer commented Nov 4, 2016

leseb commented Nov 8, 2016

leseb commented Nov 8, 2016

tchaikov commented Nov 14, 2016 • edited

leseb commented Nov 14, 2016

ktdreyer commented Nov 14, 2016

leseb commented Nov 15, 2016

ErwanAliasr1 commented Nov 16, 2016

ktdreyer commented Nov 16, 2016

leseb commented Nov 16, 2016

ghost commented Nov 17, 2016

ghost Nov 17, 2016

Choose a reason for hiding this comment

leseb Nov 17, 2016

Choose a reason for hiding this comment

leseb commented Nov 17, 2016 • edited

leseb commented Feb 8, 2017

ghost commented Feb 8, 2017

leseb commented Feb 8, 2017

ghost commented Feb 8, 2017

leseb commented Feb 8, 2017

ghost commented Feb 8, 2017

leseb commented Feb 8, 2017

ghost commented Feb 8, 2017

yuriw commented Feb 16, 2017 • edited

ChristinaMeno commented Feb 16, 2017

neurodrone commented Feb 17, 2017

vumrao commented Feb 17, 2017

vasukulkarni commented Feb 20, 2017

ganeshmaharaj commented Feb 21, 2017

ghost commented Feb 21, 2017

leseb commented Feb 21, 2017

ghost commented Feb 21, 2017

ganeshmaharaj commented Feb 21, 2017 • edited

leseb commented Feb 21, 2017

ChristinaMeno commented Feb 22, 2017

ghost commented Feb 22, 2017

tchaikov commented Nov 14, 2016 •

edited

leseb commented Nov 17, 2016 •

edited

yuriw commented Feb 16, 2017 •

edited

ganeshmaharaj commented Feb 21, 2017 •

edited