clean up tox

Change-Id: I0d4c75c090a3cb1c84d8950e6eebbc7024aa6f4e
Signed-off-by: Kevin Carter <kevin.carter@rackspace.com>

tox.ini

@@ -92,68 +92,13 @@ commands =
     bash -c "{toxinidir}/tests/common/test-ansible-lint.sh"
 
 
-# Functional testing for BTRFS backed containers
-[testenv:btrfs]
-deps =
-    {[testenv:ansible]deps}
-setenv =
-    {[testenv]setenv}
-    ANSIBLE_OVERRIDES={toxinidir}/tests/overrides-btrfs.yml
-commands =
-    bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
-
-
-# Functional testing for Directory backed containers
-[testenv:dir]
-deps =
-    {[testenv:ansible]deps}
-setenv =
-    {[testenv]setenv}
-    ANSIBLE_OVERRIDES={toxinidir}/tests/overrides-dir.yml
-commands =
-    bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
-
-
-# Functional testing for machinectl backed containers
-[testenv:mnctl]
-deps =
-    {[testenv:ansible]deps}
-setenv =
-    {[testenv]setenv}
-    ANSIBLE_OVERRIDES={toxinidir}/tests/overrides-machinectl.yml
-commands =
-    bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
-
-
-# Functional testing for OverlayFS backed containers
-[testenv:ofs]
-deps =
-    {[testenv:ansible]deps}
-setenv =
-    {[testenv]setenv}
-    ANSIBLE_OVERRIDES={toxinidir}/tests/overrides-overlayfs.yml
-commands =
-    bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
-
-
-# Functional testing for ZFS backed containers
-[testenv:zfs]
-deps =
-    {[testenv:ansible]deps}
-setenv =
-    {[testenv]setenv}
-    ANSIBLE_OVERRIDES={toxinidir}/tests/overrides-zfs.yml
-commands =
-    bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
-
-
 [testenv:functional]
 deps =
-    {[testenv:dir]deps}
+    {[testenv:ansible]deps}
 setenv =
-    {[testenv:dir]setenv}
+    {[testenv]setenv}
 commands =
-    {[testenv:dir]commands}
+    bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
 
 
 [testenv:linters]

zuul.d/jobs.yaml

@@ -29,6 +29,6 @@
     nodeset: centos-7
 
 - job:
-   name: openstack-ansible-nspawn-opensuse-423
-   parent: openstack-ansible-functional
-   nodeset: opensuse-423
+    name: openstack-ansible-nspawn-opensuse-423
+    parent: openstack-ansible-functional
+    nodeset: opensuse-423