Merge pull request #28923 from ceph/backport-nautilus-28294

nautilus: 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 431021315b183848b804af58664ab1af9e4fed87,e4d9e6760b72b23a02f6c3df97a97d2aa4eba53d..6c4a240a9cce6ea179b6ac3266d4155efb4af90c
--- 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
@@@ -58,11 -58,8 +58,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 edc89f3cee0f556e701a4d131bfb2cbb798aff8b,c358897314d3c16e9350474fc4ae5761a9234754..ca09298b5e0d97ad876fc070d0bf44deb91404c8
--- 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