diff --git a/tools/ovn_migration/tripleo_environment/playbooks/ovn-migration.yml b/tools/ovn_migration/tripleo_environment/playbooks/ovn-migration.yml index 340daca3bc3..9dc90a88e2d 100644 --- a/tools/ovn_migration/tripleo_environment/playbooks/ovn-migration.yml +++ b/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 # diff --git a/tools/ovn_migration/tripleo_environment/playbooks/roles/tripleo-update/templates/generate-ovn-extras.sh.j2 b/tools/ovn_migration/tripleo_environment/playbooks/roles/tripleo-update/templates/generate-ovn-extras.sh.j2 index 9d589b3089e..e09e04eecac 100644 --- a/tools/ovn_migration/tripleo_environment/playbooks/roles/tripleo-update/templates/generate-ovn-extras.sh.j2 +++ b/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