From 0ad615bab555d9965aec36d025acb28708b07cf0 Mon Sep 17 00:00:00 2001 From: Dimitri Savineau Date: Wed, 21 Jul 2021 16:44:57 -0400 Subject: [PATCH] ceph-volume/tests: update ansible ssh_args env var The ansible ssh_args parameter is usually defined in the ansible.cfg file. Currently this variable is overrided in tox to manage the vagrant ssh file but we lost all default values. Signed-off-by: Dimitri Savineau --- src/ceph-volume/ceph_volume/tests/functional/batch/tox.ini | 2 +- src/ceph-volume/ceph_volume/tests/functional/lvm/tox.ini | 2 +- src/ceph-volume/ceph_volume/tests/functional/simple/tox.ini | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ceph-volume/ceph_volume/tests/functional/batch/tox.ini b/src/ceph-volume/ceph_volume/tests/functional/batch/tox.ini index f7969fe9bde07..34b9af0f29936 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/batch/tox.ini +++ b/src/ceph-volume/ceph_volume/tests/functional/batch/tox.ini @@ -12,7 +12,7 @@ whitelist_externals = sleep passenv=* setenv= - ANSIBLE_SSH_ARGS = -F {changedir}/vagrant_ssh_config + ANSIBLE_SSH_ARGS = -F {changedir}/vagrant_ssh_config -o ControlMaster=auto -o ControlPersist=600s -o PreferredAuthentications=publickey ANSIBLE_ACTION_PLUGINS = {envdir}/tmp/ceph-ansible/plugins/actions ANSIBLE_STDOUT_CALLBACK = debug ANSIBLE_RETRY_FILES_ENABLED = False diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/tox.ini b/src/ceph-volume/ceph_volume/tests/functional/lvm/tox.ini index 2b63875bf438d..df6d6606a855d 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/lvm/tox.ini +++ b/src/ceph-volume/ceph_volume/tests/functional/lvm/tox.ini @@ -12,7 +12,7 @@ whitelist_externals = sleep passenv=* setenv= - ANSIBLE_SSH_ARGS = -F {changedir}/vagrant_ssh_config + ANSIBLE_SSH_ARGS = -F {changedir}/vagrant_ssh_config -o ControlMaster=auto -o ControlPersist=600s -o PreferredAuthentications=publickey ANSIBLE_ACTION_PLUGINS = {envdir}/tmp/ceph-ansible/plugins/actions ANSIBLE_STDOUT_CALLBACK = debug ANSIBLE_RETRY_FILES_ENABLED = False diff --git a/src/ceph-volume/ceph_volume/tests/functional/simple/tox.ini b/src/ceph-volume/ceph_volume/tests/functional/simple/tox.ini index c3b7d3648a1d8..798b45c24890e 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/simple/tox.ini +++ b/src/ceph-volume/ceph_volume/tests/functional/simple/tox.ini @@ -12,7 +12,7 @@ whitelist_externals = cp passenv=* setenv= - ANSIBLE_SSH_ARGS = -F {changedir}/vagrant_ssh_config + ANSIBLE_SSH_ARGS = -F {changedir}/vagrant_ssh_config -o ControlMaster=auto -o ControlPersist=600s -o PreferredAuthentications=publickey ANSIBLE_ACTION_PLUGINS = {envdir}/tmp/ceph-ansible/plugins/actions ANSIBLE_STDOUT_CALLBACK = debug ANSIBLE_RETRY_FILES_ENABLED = False -- 2.39.5