OVN migration infrared plugin does not remove ML2OVS-specific templates

[Roman Safronov]

When running migration from ML2OVS to ML2OVN using infrared plugin some ovs-specific templates remain in 'overcloud deploy' command. This is not correct and can cause issues.

Example of overcloud-deploy-ovn.sh script:

cat overcloud-deploy-ovn.sh
#!/bin/bash

openstack overcloud deploy \
--timeout 100 \
--templates /usr/share/openstack-tripleo-heat-templates \
--stack overcloud \
--libvirt-type kvm \
--ntp-server clock1.rdu2.redhat.com \
-e /home/stack/virt/config_lvm.yaml \
-e /usr/share/openstack-tripleo-heat-templates/environments/network-isolation.yaml \
-e /usr/share/openstack-tripleo-heat-templates/environments/neutron-ovs-dvr.yaml \ <= REDUNDANT TEMPLATE
-e /home/stack/virt/network/network-environment.yaml \
-e /home/stack/virt/network/dvr-override.yaml \
-e /home/stack/virt/inject-trust-anchor.yaml \
-e /home/stack/virt/hostnames.yml \
-e /home/stack/virt/debug.yaml \
-e /home/stack/virt/nodes_data.yaml \
-e ~/containers-prepare-parameter.yaml \
-e /home/stack/virt/nova-resize-on-the-same-host.yaml \
-e /home/stack/virt/ovn-extras.yaml \
-e /usr/share/openstack-tripleo-heat-templates/environments/services/neutron-ovn-dvr-ha.yaml \
-e /home/stack/ovn-extras.yaml \
-e /home/stack/container-images-ovn.yaml \
--log-file overcloud_deployment_24.log

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.opendev.org/752918

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/752918
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=526693ed3cea0db0f5d882d8935794b43e853bdc
Submitter: Zuul
Branch: master

commit 526693ed3cea0db0f5d882d8935794b43e853bdc
Author: Roman Safronov <email address hidden>
Date: Mon Sep 21 14:18:38 2020 +0300

    Remove ML2OVS-specific templates before migration to OVN

    When running migration from ML2OVS to ML2OVN using infrared plugin
    some ML2OVS-specific templates remain in 'overcloud deploy' command.
    This is not correct and can cause issues.

    Change-Id: I41c81cd42ab85395cb5fc56f339d14f2e939ebbc
    Closes-bug: #1896470

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/neutron 18.0.0.0rc1 release candidate.