From b758fdd829e3b4d7b790e6d35a02c97f3962d13e Mon Sep 17 00:00:00 2001 From: Dimitri Savineau Date: Wed, 21 Jul 2021 16:54:57 -0400 Subject: [PATCH] ceph-volume/tests: set ANSIBLE_CONFIG env var Without loading the ansible.cfg file from ceph-ansible project, we don't have the pipelining enabled which can result in significant performance improvement. This removes the ANSIBLE_ACTION_PLUGINS, ANSIBLE_RETRY_FILES_ENABLED and ANSIBLE_SSH_RETRIES environment variables as it is already included in the ansible.cfg file. Signed-off-by: Dimitri Savineau --- src/ceph-volume/ceph_volume/tests/functional/batch/tox.ini | 4 +--- src/ceph-volume/ceph_volume/tests/functional/lvm/tox.ini | 4 +--- src/ceph-volume/ceph_volume/tests/functional/simple/tox.ini | 4 +--- 3 files changed, 3 insertions(+), 9 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 34b9af0f29936..761339b0c48f9 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/batch/tox.ini +++ b/src/ceph-volume/ceph_volume/tests/functional/batch/tox.ini @@ -12,11 +12,9 @@ whitelist_externals = sleep passenv=* setenv= + ANSIBLE_CONFIG = {envdir}/tmp/ceph-ansible/ansible.cfg 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 - ANSIBLE_SSH_RETRIES = 5 VAGRANT_CWD = {changedir} CEPH_VOLUME_DEBUG = 1 DEBIAN_FRONTEND=noninteractive 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 df6d6606a855d..4cf6387832c8d 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/lvm/tox.ini +++ b/src/ceph-volume/ceph_volume/tests/functional/lvm/tox.ini @@ -12,11 +12,9 @@ whitelist_externals = sleep passenv=* setenv= + ANSIBLE_CONFIG = {envdir}/tmp/ceph-ansible/ansible.cfg 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 - ANSIBLE_SSH_RETRIES = 5 VAGRANT_CWD = {changedir} CEPH_VOLUME_DEBUG = 1 DEBIAN_FRONTEND=noninteractive 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 798b45c24890e..7c106ccbe7761 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/simple/tox.ini +++ b/src/ceph-volume/ceph_volume/tests/functional/simple/tox.ini @@ -12,11 +12,9 @@ whitelist_externals = cp passenv=* setenv= + ANSIBLE_CONFIG = {envdir}/tmp/ceph-ansible/ansible.cfg 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 - ANSIBLE_SSH_RETRIES = 5 VAGRANT_CWD = {changedir} CEPH_VOLUME_DEBUG = 1 DEBIAN_FRONTEND=noninteractive -- 2.39.5