mirror of https://github.com/ceph/ceph-ansible.git
tests: remove useless setting
this setting is not needed here since we explicitely set it for
container and non container context.
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 87b173d022
)
pull/4243/head
v4.0.0rc11
parent
bee8a31afe
commit
2c64166eac
|
@ -22,8 +22,6 @@ setenv=
|
||||||
# only available for ansible >= 2.5
|
# only available for ansible >= 2.5
|
||||||
ANSIBLE_STDOUT_CALLBACK = yaml
|
ANSIBLE_STDOUT_CALLBACK = yaml
|
||||||
# non_container: DEV_SETUP = True
|
# non_container: DEV_SETUP = True
|
||||||
centos: CEPH_ANSIBLE_VAGRANT_BOX = centos/7
|
|
||||||
fedora: CEPH_ANSIBLE_VAGRANT_BOX = fedora/29-atomic-host
|
|
||||||
# Set the vagrant box image to use
|
# Set the vagrant box image to use
|
||||||
centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/7
|
centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/7
|
||||||
centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/atomic-host
|
centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/atomic-host
|
||||||
|
|
|
@ -21,8 +21,6 @@ setenv=
|
||||||
# only available for ansible >= 2.5
|
# only available for ansible >= 2.5
|
||||||
ANSIBLE_STDOUT_CALLBACK = yaml
|
ANSIBLE_STDOUT_CALLBACK = yaml
|
||||||
# non_container: DEV_SETUP = True
|
# non_container: DEV_SETUP = True
|
||||||
centos: CEPH_ANSIBLE_VAGRANT_BOX = centos/7
|
|
||||||
fedora: CEPH_ANSIBLE_VAGRANT_BOX = fedora/29-atomic-host
|
|
||||||
# Set the vagrant box image to use
|
# Set the vagrant box image to use
|
||||||
centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/7
|
centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/7
|
||||||
centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/atomic-host
|
centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/atomic-host
|
||||||
|
|
2
tox.ini
2
tox.ini
|
@ -357,8 +357,6 @@ setenv=
|
||||||
# only available for ansible >= 2.5
|
# only available for ansible >= 2.5
|
||||||
ANSIBLE_STDOUT_CALLBACK = yaml
|
ANSIBLE_STDOUT_CALLBACK = yaml
|
||||||
non_container: DEV_SETUP = True
|
non_container: DEV_SETUP = True
|
||||||
centos: CEPH_ANSIBLE_VAGRANT_BOX = centos/7
|
|
||||||
fedora: CEPH_ANSIBLE_VAGRANT_BOX = fedora/29-atomic-host
|
|
||||||
# Set the vagrant box image to use
|
# Set the vagrant box image to use
|
||||||
centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/7
|
centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/7
|
||||||
centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/atomic-host
|
centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/atomic-host
|
||||||
|
|
Loading…
Reference in New Issue