From: Alfredo Deza <adeza@redhat.com>
Date: Mon, 8 Jul 2019 17:27:16 +0000 (-0400)
Subject: Merge pull request #28923 from ceph/backport-nautilus-28294
X-Git-Tag: v14.2.2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6e9f39bad46c0c93ec91ab56d0b86b8bffb0bc3a;p=ceph.git

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>
---

6e9f39bad46c0c93ec91ab56d0b86b8bffb0bc3a
diff --cc src/ceph-volume/ceph_volume/tests/functional/batch/tox.ini
index 431021315b183,e4d9e6760b72b..6c4a240a9cce6
--- a/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 edc89f3cee0f5,c358897314d3c..ca09298b5e0d9
--- a/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