]> git.apps.os.sepia.ceph.com Git - teuthology.git/commit
orchestra.connect: do not override user/host from ~/.ssh/config 964/head
authorDan Mick <dan.mick@redhat.com>
Sat, 8 Oct 2016 05:46:04 +0000 (22:46 -0700)
committerDan Mick <dan.mick@redhat.com>
Tue, 11 Oct 2016 20:10:07 +0000 (13:10 -0700)
commit97086c02349d118b30b2aacf1e3bfc4cdc1e5bc3
tree2a4292a91f9211ffb38ea7d6ecbeb238836ae0e8
parent1d3e5ed8c6409ae63bb4f4de21250428a60bd8ea
orchestra.connect: do not override user/host from ~/.ssh/config

I don't know why this was ever the case, but ignoring user@host
from the targets list just seems like a bad idea, and causes
problems, because tasks/ansible/etc. assume that the user to use
is ubuntu.  If that's not what .ssh/config says, there's just
going to be trouble...but there's no reason to pay attention
to .ssh/config there; if you really want to play tricks, edit
your target list accordingly.

Also, the original code was apparently not prepared for the
key_filename to be a list, which it apparently always is,
at least now; handle that too.

Fixes: http://tracker.ceph.com/issues/17125
Signed-off-by: Dan Mick <dan.mick@redhat.com>
teuthology/orchestra/connection.py