Merge pull request #28926 from ceph/backport-luminous-28294

luminous: tests: pass --ssh-config to pytest to resolve hosts when connecting

Reviewed-by: Alfredo Deza <adeza@redhat.com>

diff --cc src/ceph-volume/ceph_volume/tests/functional/batch/tox.ini
index a37113db964e09ffbd2f833a43586015f42044fd,b8564ec5eabf45868106d39ed7b8321eb6a3c7a1..9f07e815f6c5a226046f42361d8d0a138cb38d57
--- 1/src/ceph-volume/ceph_volume/tests/functional/batch/tox.ini
--- 2/src/ceph-volume/ceph_volume/tests/functional/batch/tox.ini
+++ b/src/ceph-volume/ceph_volume/tests/functional/batch/tox.ini
@@@ -54,11 -54,8 +54,11 @@@ commands
    # reboot all vms - attempt
    bash {toxinidir}/../scripts/vagrant_reload.sh {env:VAGRANT_UP_FLAGS:"--no-provision"} {posargs:--provider=virtualbox}
  
 +  # after a reboot, osds may take about 20 seconds to come back up
 +  sleep 30
 +
    # retest to ensure cluster came back up correctly after rebooting
-   py.test -n 4 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts {toxinidir}/../tests
+   py.test -n 4 --sudo -v --connection=ansible --ssh-config={changedir}/vagrant_ssh_config --ansible-inventory={changedir}/hosts {toxinidir}/../tests
  
    # destroy an OSD, zap it's device and recreate it using it's ID
    ansible-playbook -vv -i {changedir}/hosts {changedir}/test.yml

diff --cc src/ceph-volume/ceph_volume/tests/functional/lvm/tox.ini
index d0b56b473b8742ca65d5495ab5492fe82761584b,1c279edc3310eb8f708e6b707730bef1c475d213..e9e939d1984ff4441df24d4859db58208b96a8c7
--- 1/src/ceph-volume/ceph_volume/tests/functional/lvm/tox.ini
--- 2/src/ceph-volume/ceph_volume/tests/functional/lvm/tox.ini
+++ b/src/ceph-volume/ceph_volume/tests/functional/lvm/tox.ini
@@@ -62,11 -62,8 +62,11 @@@ commands
    # reboot all vms - attempt
    bash {toxinidir}/../scripts/vagrant_reload.sh {env:VAGRANT_UP_FLAGS:"--no-provision"} {posargs:--provider=virtualbox}
  
 +  # after a reboot, osds may take about 20 seconds to come back up
 +  sleep 30
 +
    # retest to ensure cluster came back up correctly after rebooting
-   py.test -n 4 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts {toxinidir}/../tests
+   py.test -n 4 --sudo -v --connection=ansible --ssh-config={changedir}/vagrant_ssh_config --ansible-inventory={changedir}/hosts {toxinidir}/../tests
  
    # destroy an OSD, zap it's device and recreate it using it's ID
    ansible-playbook -vv -i {changedir}/hosts {changedir}/test.yml