fix os-vif jobs following default change to ovn

[sean mooney]

the os-vif ci is ment to test the ovs plug with ml2/ovs using the openvswtich firewall driver
to test ovs deploymets with hybrid-plug=false and with ml2/ovs and iptables to test hybrid-plug=true.

following the change to ovn by default in devstack both jobs now use ovn instead.

to test both states of hybrid plug we need to revert this change locally in os-vif but we
do not need to test only with ml2/ovs

to maintain the current number of jobs and the same level of testing of the ovs plugin we can replace teh ml2/ovs with openvswitch firewall driver job with an ovn job.

from an os-vif point of view there is no different between ml2/ovs and ml2/ovn out side of the use fo hybrid plug so we do not need to have 3 jobs to test all 3 combindintions.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.opendev.org/c/openstack/os-vif/+/798038

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/os-vif/+/798038
Committed: https://opendev.org/openstack/os-vif/commit/b75af3ae1303cf449e881f14191bb10a3fdc373d
Submitter: "Zuul (22348)"
Branch: master

commit b75af3ae1303cf449e881f14191bb10a3fdc373d
Author: Sean Mooney <email address hidden>
Date: Fri Jun 25 05:08:16 2021 +0000

    update os-vif ci to account for devstack default changes

    This change restores the os-vif-ovs-iptables job to deploying
    with ml2/ovs follow the devstack default change to ovn.

    This change replaces the os-vif-ovs job with an os-vif-ovn jobs.

    This change also simplifies teh os-vif-ovs-base job by disabling
    DVR since that does not change the behavior of os-vif.

    This change reduces the job time out to 7800 and moves it
    to os-vif-tempest-base.

    Closes-Bug: #1933590
    Change-Id: Icda02ec4b5be18c3646af7988f210baf4ceb0890

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/os-vif 2.6.0 release.