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

hammer: fix ceph-deploy task with CephFS (#11316) #397

Merged
merged 4 commits into from Apr 21, 2015

Conversation

jcsp
Copy link
Contributor

@jcsp jcsp commented Apr 8, 2015

This isn't a nice "cherry-pick -x" backport because master version of this is waiting for #383

@ceph-jenkins
Copy link

Refer to this link for build results (access rights to CI server needed):
http://jenkins.ceph.com//job/ceph-qa-suite-pull-requests/275/
Tests failed for this pull request.

@ceph-jenkins
Copy link

Refer to this link for build results (access rights to CI server needed):
http://jenkins.ceph.com//job/ceph-qa-suite-pull-requests/279/
Tests passed for this pull request.

@gregsfortytwo gregsfortytwo self-assigned this Apr 9, 2015
@codenrhoden
Copy link
Contributor

👍

@gregsfortytwo
Copy link
Member

The master version of this has passed stuff; anything else needed to merge?

@gregsfortytwo gregsfortytwo assigned jcsp and unassigned gregsfortytwo Apr 20, 2015
John Spray added 4 commits April 21, 2015 14:14
Move up into Filesystem so that this can be used from
the ceph_deploy task as well.

Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit ea7c392)
... s/mon_remote/admin_remote/ and allow caller to pass
in which remote they want to use for that.  Enables use
with ceph_deploy task which does not give admin keys
to mons.

Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit 8b61310)
...so that we may be used with the ceph_deploy task
that doesn't set that up.

Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit f360110)
This test apparently had not been touched since
"fs new" was added.  In addition to calling
Filesystem.create:
 * modify the get_nodes_using_role
   function to modify ctx.cluster.remotes so that the
   service IDs match what ceph-deploy will set
 * log exceptions during ceph_deploy setup, as otherwise
   they can get lost if another exception occurs during
   teardown (so that it's all easier to debug).
 * default to passing --dev=master during install, so
   that we don't error out horribly when run without
   an explicit branch set (e.g. when run outside
   scheduled suite)

Fixes: #11316
Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit 7c2e6cd)
@ceph-jenkins
Copy link

Refer to this link for build results (access rights to CI server needed):
http://jenkins.ceph.com//job/ceph-qa-suite-pull-requests/319/
Tests passed for this pull request.

@jcsp
Copy link
Contributor Author

jcsp commented Apr 21, 2015

Re-cherry-picked to have it match up nicely with master, should be good to go

gregsfortytwo added a commit that referenced this pull request Apr 21, 2015
hammer: fix ceph-deploy task with CephFS (#11316)
@gregsfortytwo gregsfortytwo merged commit 1cb3c76 into hammer Apr 21, 2015
@gregsfortytwo gregsfortytwo deleted the wip-11316-hammer branch April 21, 2015 21:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants