From 526693ed3cea0db0f5d882d8935794b43e853bdc Mon Sep 17 00:00:00 2001 From: Roman Safronov Date: Mon, 21 Sep 2020 14:18:38 +0300 Subject: [PATCH] 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 --- .../roles/prepare-migration/tasks/main.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tools/ovn_migration/infrared/tripleo-ovn-migration/roles/prepare-migration/tasks/main.yml b/tools/ovn_migration/infrared/tripleo-ovn-migration/roles/prepare-migration/tasks/main.yml index ca4d47e2b19..15b034c0c42 100644 --- a/tools/ovn_migration/infrared/tripleo-ovn-migration/roles/prepare-migration/tasks/main.yml +++ b/tools/ovn_migration/infrared/tripleo-ovn-migration/roles/prepare-migration/tasks/main.yml @@ -31,6 +31,16 @@ set_fact: overcloud_deploy_ovn_script: '~/overcloud-deploy-ovn.sh' +- name: Remove ml2ovs-specific environment files from overcloud deploy ovn script + lineinfile: + dest: "{{ overcloud_deploy_ovn_script }}" + state: absent + regexp: "{{ item }}" + with_items: + - "^.*openstack-tripleo-heat-templates.*ovs.*yaml" + - ".*neutron-sriov.yaml.*" + when: infrared_deployment|bool + - name: Set container images environment file set_fact: output_env_file: /home/stack/container-images-ovn.yaml