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

mimic: tests: do not take ceph.conf.template from ceph/teuthology.git #30841

Merged
merged 2 commits into from Oct 23, 2019

Conversation

@smithfarm
Copy link
Contributor

smithfarm commented Oct 10, 2019

backport tracker: https://tracker.ceph.com/issues/42263


parent tracker: https://tracker.ceph.com/issues/42261

this backport was staged using ceph-backport.sh version 15.0.0.5775
find the latest version at https://github.com/ceph/ceph/blob/master/src/script/ceph-backport.sh

@smithfarm smithfarm added this to the mimic milestone Oct 10, 2019
@smithfarm smithfarm added the tests label Oct 10, 2019
@smithfarm smithfarm requested a review from kshtsk Oct 10, 2019
@smithfarm smithfarm changed the title mimic: mimic and luminous still need to read ceph.conf.template from teuthology mimic: tests: do not take ceph.conf.template from ceph/teuthology.git Oct 10, 2019
Copy link
Member

neha-ojha left a comment

@smithfarm de9b77c has msgr2 related changes, we don't want them in luminous and mimic.

…tly; support mon bind * options

Having these live in teuthology.git is silly, since they are only consumed
by the ceph task, and it is hard to revise the behavior.

Revise the behavior by adding mon_bind_* options.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 1ab352d)

Conflicts:
    qa/tasks/ceph.py
- the nautilus version of "get_mons()" includes msgr V2 code which is not needed
  in mimic
@smithfarm smithfarm force-pushed the smithfarm:wip-42263-mimic branch from 679f361 to b9afa2b Oct 10, 2019
@smithfarm

This comment has been minimized.

Copy link
Contributor Author

smithfarm commented Oct 10, 2019

@neha-ojha Ack. I think it's fixed now - please take another look?

@smithfarm

This comment has been minimized.

Copy link
Contributor Author

smithfarm commented Oct 18, 2019

@neha-ojha Ping, my question above

Copy link
Member

neha-ojha left a comment

I'm fine with this, but would like to know what others think.

@kshtsk
kshtsk approved these changes Oct 21, 2019
Copy link
Contributor

kshtsk left a comment

lgtm, but I'm not sure about that mimic specific part since I'm not confident.

@yuriw

This comment has been minimized.

Copy link
Contributor

yuriw commented Oct 21, 2019

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 0483c1c)
@smithfarm

This comment has been minimized.

Copy link
Contributor Author

smithfarm commented Oct 22, 2019

Note: 0483c1c was omitted from #30180 so I added it here.

@yuriw yuriw merged commit 9d2a74d into ceph:mimic Oct 23, 2019
4 checks passed
4 checks passed
Docs: build check OK - docs built
Details
Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
make check make check succeeded
Details
@smithfarm smithfarm deleted the smithfarm:wip-42263-mimic branch Oct 23, 2019
@@ -480,7 +590,10 @@ def cluster(ctx, config):
roles = [role_list for (remote, role_list) in remotes_and_roles]
ips = [host for (host, port) in
(remote.ssh.get_transport().getpeername() for (remote, role_list) in remotes_and_roles)]
conf = teuthology.skeleton_config(ctx, roles=roles, ips=ips, cluster=cluster_name)
mons = get_mons(roles, ips)

This comment has been minimized.

Copy link
@dillaman

dillaman Nov 5, 2019

Contributor

I believe this is breaking the RBD mirroring test cases since support for multiple clusters seems to have been dropped here.

This comment has been minimized.

Copy link
@smithfarm

smithfarm Nov 5, 2019

Author Contributor

yikes! fixing

This comment has been minimized.

Copy link
@smithfarm

smithfarm Nov 5, 2019

Author Contributor

yikes! fixing

'--clobber',
]
for (name, addr) in addresses:
n = name[4:]

This comment has been minimized.

Copy link
@dillaman

dillaman Nov 5, 2019

Contributor

I think the name could be cluster1.mon.a so fixing this to 4 would be incorrect. Need teuthology.split_role(name)?

@smithfarm

This comment has been minimized.

Copy link
Contributor Author

smithfarm commented Nov 6, 2019

Thanks for the hints, @dillaman - see #31424

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.