Merge "ovn-migration: Remove second tripleo-update call"

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