ovn-migration: Remove second tripleo-update call

The second tripleo-update call was there only to update back integration
bridge variable. However the action did the whole deploy for all nodes
in the environment, which can take hours to finish. This patch relies on
other patch in THT that sets br-int as default value. This way once
ovn-extras.yml is not used and the integration bridge is not overriden,
we no longer need to update tripleo about the value so it's safe to
remove the second call.

Depends-On: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/847402
Change-Id: I7455852898bb6e9698ecf5261d4401bc5077c506
Signed-off-by: Jakub Libosvar <libosvar@redhat.com>

tools/ovn_migration/tripleo_environment/playbooks/ovn-migration.yml

@@ -44,8 +44,6 @@
   hosts: localhost
   roles:
     - tripleo-update
-  vars:
-      ovn_bridge: br-migration
   tags:
     - setup
   become: false
@@ -80,20 +78,6 @@
   tags:
     - post-migration
 
-#
-# Final step to make sure tripleo knows about OVNIntegrationBridge == br-int.
-#
-
-- name: Rerun the stack update to reset the OVNIntegrationBridge to br-int
-  hosts: localhost
-  roles:
-    - tripleo-update
-  vars:
-      ovn_bridge: br-int
-  tags:
-    - setup
-  become: false
-
 #
 # Final validation after tripleo update to br-int
 #

tools/ovn_migration/tripleo_environment/playbooks/roles/tripleo-update/templates/generate-ovn-extras.sh.j2

@@ -3,6 +3,6 @@ set -x
 
 cat > $HOME/ovn-extras.yaml << EOF
 parameter_defaults:
-  OVNIntegrationBridge: "{{ ovn_bridge }}"
+  OVNIntegrationBridge: "br-migration"
   ForceNeutronDriverUpdate: true
 EOF