openstack/neutron
Code Issues Proposed changes

Merge "[OVN][Migration] Enable settings backup subnet for NFS clients"

Browse Source
This commit is contained in:
Zuul 2023-05-29 18:35:03 +00:00 committed by Gerrit Code Review
commit 4bc538d7ea
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/source/ovn/migration.rst
View File

@ -155,6 +155,12 @@ Perform the following steps in the undercloud
server that will be used as a NFS server to store the backup. server that will be used as a NFS server to store the backup.
Default: 192.168.24.1 Default: 192.168.24.1
* BACKUP_MIGRATION_CTL_PLANE_CIDRS - Only used if CREATE_BACKUP is enabled.
A comma separated string of control plane subnets in CIDR notation for the
controllers being backed up. The specified subnets will be used to enable
NFS remote clients connections.
Default: 192.168.24.0/24
.. warning:: .. warning::
Please note that VALIDATE_MIGRATION requires enough quota (2 Please note that VALIDATE_MIGRATION requires enough quota (2

4
tools/ovn_migration/tripleo_environment/ovn_migration.sh
View File

@ -42,7 +42,8 @@ LANG=C
: ${VALIDATE_MIGRATION:=False} : ${VALIDATE_MIGRATION:=False}
: ${DHCP_RENEWAL_TIME:=30} : ${DHCP_RENEWAL_TIME:=30}
: ${CREATE_BACKUP:=True} : ${CREATE_BACKUP:=True}
: ${BACKUP_MIGRATION_IP:=192.168.24.1} # TODO: Document this new var : ${BACKUP_MIGRATION_IP:=192.168.24.1}
: ${BACKUP_MIGRATION_CTL_PLANE_CIDRS:=192.168.24.0/24}
check_for_necessary_files() { check_for_necessary_files() {
@ -328,6 +329,7 @@ start_migration() {
-e overcloudrc=$OVERCLOUDRC_FILE \ -e overcloudrc=$OVERCLOUDRC_FILE \
-e stackrc=$STACKRC_FILE \ -e stackrc=$STACKRC_FILE \
-e backup_migration_ip=$BACKUP_MIGRATION_IP \ -e backup_migration_ip=$BACKUP_MIGRATION_IP \
-e backup_migration_ctl_plane_cidrs=$BACKUP_MIGRATION_CTL_PLANE_CIDRS \
-e create_backup=$CREATE_BACKUP \ -e create_backup=$CREATE_BACKUP \
-e ansible_inventory=$inventory_file \ -e ansible_inventory=$inventory_file \
-e validate_migration=$VALIDATE_MIGRATION $* -e validate_migration=$VALIDATE_MIGRATION $*

1
tools/ovn_migration/tripleo_environment/playbooks/roles/recovery-backup/tasks/main.yml
View File

@ -36,6 +36,7 @@
--setup-nfs \ --setup-nfs \
--extra-vars '{ --extra-vars '{
"tripleo_backup_and_restore_server": {{ backup_migration_ip }}, "tripleo_backup_and_restore_server": {{ backup_migration_ip }},
"tripleo_backup_and_restore_clients_nets": {{ backup_migration_ctl_plane_cidrs.split(',') }},
"nfs_server_group_name": {{ revert_preparation_server_name }} "nfs_server_group_name": {{ revert_preparation_server_name }}
}' }'