Attachment 1761266 Details for Bug 1936018 – Changes made to migration

[patch] Changes made to migration

0018-migration-Limited-migration-for-cae-02886008.patch (text/plain), 5.07 KB, created by Jakub Libosvar on 2021-03-07 11:22:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jakub Libosvar

Created: 2021-03-07 11:22:05 UTC

Size: 5.07 KB

patch

obsolete

>From 6a1a0e6a245d04f95ccd0faa35e00a79a15298fc Mon Sep 17 00:00:00 2001
>From: Jakub Libosvar <libosvar@redhat.com>
>Date: Sun, 7 Mar 2021 10:42:16 +0000
>Subject: [PATCH] migration: Limited migration for cae 02886008
>
>Change-Id: I55c1a94ec423da4ab687bc6eb7bad39558236356
>---
> .../playbooks/ovn-migration.yml                    | 82 ----------------------
> .../playbooks/roles/migration/tasks/main.yml       |  7 --
> .../roles/migration/templates/activate-ovn.sh.j2   | 19 +----
> 3 files changed, 1 insertion(+), 107 deletions(-)
>
>diff --git a/migration/tripleo_environment/playbooks/ovn-migration.yml b/migration/tripleo_environment/playbooks/ovn-migration.yml
>index c0c73da..ebc7cfa 100644
>--- a/migration/tripleo_environment/playbooks/ovn-migration.yml
>+++ b/migration/tripleo_environment/playbooks/ovn-migration.yml
>@@ -1,54 +1,5 @@
> # This is the playbook used by ovn-migration.sh.
> 
>-#
>-# Pre migration and validation tasks will make sure that the initial cloud
>-# is functional, and will create resources which will be checked after
>-# migration.
>-#
>-
>-- name: Pre migration and validation tasks
>-  hosts: localhost
>-  roles:
>-    - pre-migration
>-  tags:
>-    - pre-migration
>-
>-#
>-# This step is executed before migration, and will backup some config
>-# files related to containers before those get lost.
>-#
>-
>-- name: Backup tripleo container config files on the nodes
>-  hosts: ovn-controllers
>-  roles:
>-    - backup
>-  tags:
>-    - setup
>-
>-
>-- name: Stop ml2/ovs resources
>-  hosts: ovn-controllers
>-  roles:
>-    - stop-agents
>-  tags:
>-    - migration
>-
>-#
>-# TripleO / Director is executed to deploy ovn using "br-migration" for the
>-# dataplane, while br-int is left intact to avoid dataplane disruption.
>-#
>-
>-- name: Set up OVN and configure it using tripleo
>-  hosts: localhost
>-  roles:
>-    - tripleo-update
>-  vars:
>-      ovn_bridge: br-migration
>-  tags:
>-    - setup
>-  become: false
>-
>-#
> # Once everything is migrated prepare everything by syncing the neutron DB
> # into the OVN NB database, and then switching the dataplane to br-int
> # letting ovn-controller take control, afterwards any remaining neutron
>@@ -62,8 +13,6 @@
>     - migration
>   vars:
>       ovn_bridge: br-int
>-  tags:
>-    - migration
> 
> #
> # Verify that the initial resources are still reachable, remove them,
>@@ -74,37 +23,6 @@
>   hosts: localhost
>   roles:
>     - delete-neutron-resources
>-    - post-migration
>-  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
>-#
>-
>-- name: Final validation
>-  hosts: localhost
>-  vars:
>-      validate_premigration_resources: false
>-  roles:
>-    - post-migration
>-  tags:
>-    - final-validation
>-
> 
> #
> # Announce that it's done and ready.
>diff --git a/migration/tripleo_environment/playbooks/roles/migration/tasks/main.yml b/migration/tripleo_environment/playbooks/roles/migration/tasks/main.yml
>index f05fad7..672306a 100644
>--- a/migration/tripleo_environment/playbooks/roles/migration/tasks/main.yml
>+++ b/migration/tripleo_environment/playbooks/roles/migration/tasks/main.yml
>@@ -1,12 +1,5 @@
> ---
>-- include_tasks: clone-dataplane.yml
>-
>-- include_tasks: sync-dbs.yml
>-  when: ovn_central is defined
>-
> - include_tasks: activate-ovn.yml
> 
> - include_tasks: cleanup-dataplane.yml
>   when: ovn_controller is defined
>-  tags:
>-    - cleanup-dataplane
>diff --git a/migration/tripleo_environment/playbooks/roles/migration/templates/activate-ovn.sh.j2 b/migration/tripleo_environment/playbooks/roles/migration/templates/activate-ovn.sh.j2
>index 72e8d69..ce41106 100644
>--- a/migration/tripleo_environment/playbooks/roles/migration/templates/activate-ovn.sh.j2
>+++ b/migration/tripleo_environment/playbooks/roles/migration/templates/activate-ovn.sh.j2
>@@ -2,12 +2,7 @@
> 
> set -x
> 
>-podman stop ovn_controller
>-
>-# restore bridge mappings
>-ovn_orig_bm=$(ovs-vsctl get open . external_ids:ovn-bridge-mappings-back)
>-ovs-vsctl set open . external_ids:ovn-bridge-mappings="$ovn_orig_bm"
>-ovs-vsctl remove open . external_ids ovn-bridge-mappings-back
>+ovn_orig_bm=$(ovs-vsctl get open . external_ids:ovn-bridge-mappings)
> 
> ovn_bms=$(echo $ovn_orig_bm | sed 's/\"//g' | sed 's/,/ /g')
> 
>@@ -25,18 +20,6 @@ done
> # Delete controller from integration bridge
> ovs-vsctl del-controller {{ ovn_bridge }}
> 
>-# Activate ovn-controller by configuring integration bridge
>-ovs-vsctl set open . external_ids:ovn-bridge={{ ovn_bridge }}
>-
>-# WORKAROUND for https://bugzilla.redhat.com/show_bug.cgi?id=1782834
>-# By restarting ovs-vswitchd process, new connection is made based
>-# on the protocols values set in OVS database. OVS 2.13 by default
>-# implements OpenFlow protocols up to 1.5 and 1.5 is the one that
>-# is required by ovn-controller.
>-systemctl restart openvswitch
>-
>-podman start ovn_controller
>-
> # Delete ovs bridges - br-tun and br-migration
> ovs-vsctl --if-exists del-br {{ tunnel_bridge }}
> ovs-vsctl --if-exists del-br br-migration

Actions: View | Diff

Attachments on bug 1936018: 1761266