From: Dimitri Savineau Date: Mon, 9 Sep 2019 15:11:43 +0000 (-0400) Subject: tox: Fix incorrect ANSIBLE_CONFIG value X-Git-Tag: v5.0.0alpha1~126 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7bd03c95f67c4e2f626e40d0ece8d2feffc5c886;p=ceph-ansible.git tox: Fix incorrect ANSIBLE_CONFIG value The ANSIBLE_CONFIG value wasn't set correctly for two scenarios. This environment variable doesn't use '-F'. Signed-off-by: Dimitri Savineau --- diff --git a/tox.ini b/tox.ini index b204cba72..6b6182ec8 100644 --- a/tox.ini +++ b/tox.ini @@ -18,7 +18,7 @@ whitelist_externals = passenv=* setenv= ANSIBLE_SSH_ARGS = -F {changedir}/vagrant_ssh_config -o ControlMaster=auto -o ControlPersist=600s -o PreferredAuthentications=publickey - ANSIBLE_CONFIG = -F {toxinidir}/ansible.cfg + ANSIBLE_CONFIG = {toxinidir}/ansible.cfg ANSIBLE_ACTION_PLUGINS = {toxinidir}/plugins/actions ANSIBLE_CALLBACK_PLUGINS = {toxinidir}/plugins/callback ANSIBLE_CALLBACK_WHITELIST = profile_tasks @@ -87,7 +87,7 @@ whitelist_externals = passenv=* setenv= ANSIBLE_SSH_ARGS = -F {changedir}/vagrant_ssh_config -o ControlMaster=auto -o ControlPersist=600s -o PreferredAuthentications=publickey - ANSIBLE_CONFIG = -F {toxinidir}/ansible.cfg + ANSIBLE_CONFIG = {toxinidir}/ansible.cfg ANSIBLE_ACTION_PLUGINS = {toxinidir}/plugins/actions ANSIBLE_CALLBACK_PLUGINS = {toxinidir}/plugins/callback ANSIBLE_CALLBACK_WHITELIST = profile_tasks