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.

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

ceph-volume: adds --crush-device-class flag for lvm prepare and create #19949

Merged
merged 6 commits into from Jan 18, 2018

Conversation

andrewschoen
Copy link
Contributor

@andrewschoen andrewschoen commented Jan 15, 2018

This supports the new method of setting the crush device class through the json given to the osd new command. Introduced here: #19939

Needs this for ceph-ansible support and for CI testing: ceph/ceph-ansible#2318

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1498521

@alfredodeza
Copy link
Contributor

@tchaikov this adds a couple of changes to ceph-disk so that it doesn't break when pr #19939 lands

@@ -2755,7 +2758,7 @@ def create_key(self):
bootstrap = self.args.prepare_key_template.format(cluster=cluster,
statedir=STATEDIR)
path = self.get_mount_point()
secrets = LockboxSecrets(self.args)
secrets = LockboxSecrets(self.args, crush_device_class=self.args.crush_device_class)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit, i don't think we need to pass crush_device_classa separately if it's already in self.args.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
@andrewschoen
Copy link
Contributor Author

@alfredodeza @tchaikov I've removed the ceph-disk support from this PR, it needed a bit more work. The ceph-volume support here is good to go though.

@andrewschoen
Copy link
Contributor Author

jenkins test ceph-volume tox

@alfredodeza
Copy link
Contributor

jenkins test ceph-volume lvm centos7-bluestore-create

1 similar comment
@andrewschoen
Copy link
Contributor Author

jenkins test ceph-volume lvm centos7-bluestore-create

Move the terminal.success to the methods that have access to the
correct osd_id so that they do not print None for the osd_id
in the log message.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
@andrewschoen
Copy link
Contributor Author

jenkins test ceph-volume lvm all

@alfredodeza alfredodeza merged commit 7cee6c8 into master Jan 18, 2018
@alfredodeza alfredodeza deleted the wip-bz1498521 branch January 18, 2018 13:49
alfredodeza added a commit that referenced this pull request Feb 1, 2018
luminous: ceph-volume: adds --crush-device-class flag for lvm prepare and create #19949 

Reviewed-by: Alfredo Deza <adeza@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants