Skip to content

Commit

Permalink
tests: update tox.ini
Browse files Browse the repository at this point in the history
This commit updates the tox.ini with needed change in order to be able
to run ceph-ansible.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 13b097c)
  • Loading branch information
guits authored and dsavineau committed Apr 15, 2020
1 parent a148f32 commit e02c302
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
3 changes: 1 addition & 2 deletions tests/tox.sh
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,7 @@ vagrant up --no-provision --provider="$VAGRANT_PROVIDER"

bash "$TOXINIDIR"/ceph-ansible/tests/scripts/generate_ssh_config.sh "$CEPH_ANSIBLE_SCENARIO_PATH"

export ANSIBLE_SSH_ARGS="-F $CEPH_ANSIBLE_SCENARIO_PATH/vagrant_ssh_config"

export ANSIBLE_SSH_ARGS="-F $CEPH_ANSIBLE_SCENARIO_PATH/vagrant_ssh_config -o ControlMaster=auto -o ControlPersist=600s -o PreferredAuthentications=publickey"

# runs a playbook to configure nodes for testing
ansible-playbook -vv -i "$CEPH_ANSIBLE_SCENARIO_PATH"/hosts "$TOXINIDIR"/tests/setup.yml --extra-vars="ceph_docker_registry=$REGISTRY_ADDRESS"
Expand Down
5 changes: 4 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,11 @@ whitelist_externals =
passenv=*
setenv=
TOXINIDIR = {toxinidir}
ANSIBLE_CONFIG = {toxinidir}/ceph-ansible/ansible.cfg
ANSIBLE_ACTION_PLUGINS = {toxinidir}/ceph-ansible/plugins/actions
# only available for ansible >= 2.2
ANSIBLE_CALLBACK_PLUGINS = {toxinidir}/ceph-ansible/plugins/callback
ANSIBLE_CALLBACK_WHITELIST = profile_tasks
ANSIBLE_FILTER_PLUGINS = {toxinidir}/ceph-ansible/plugins/filter
ANSIBLE_STDOUT_CALLBACK = debug
all_daemons: CEPH_ANSIBLE_SCENARIO_PATH = {toxinidir}/ceph-ansible/tests/functional/all_daemons/container
collocation: CEPH_ANSIBLE_SCENARIO_PATH = {toxinidir}/ceph-ansible/tests/functional/collocation/container
Expand Down

0 comments on commit e02c302

Please sign in to comment.