]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
tox: Fix incorrect ANSIBLE_CONFIG value
authorDimitri Savineau <dsavinea@redhat.com>
Mon, 9 Sep 2019 15:11:43 +0000 (11:11 -0400)
committerDimitri Savineau <savineau.dimitri@gmail.com>
Mon, 9 Sep 2019 15:23:30 +0000 (11:23 -0400)
The ANSIBLE_CONFIG value wasn't set correctly for two scenarios. This
environment variable doesn't use '-F'.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
tox.ini

diff --git a/tox.ini b/tox.ini
index b204cba72225f0070527135850e0ce0ea6a17b2a..6b6182ec8f4d4bce0a4cd251be527460a8835a78 100644 (file)
--- 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