Skip to content

Commit 4529b5b

Browse files
committed
Rename setup-mtu-t1 argument because it is misleading
setup-mtu-t1 argument name is misleading as it suggest that it will do something with the MTU value, but it really just reduces DHCP agent t1 timer. The fact that this commnad will have a side effect of getting a new MTU value from DHCP should not be part of the argument name. This is based on customer's feedback. I am keeping backward compatibility for setup-mtu-t1 argument in order not to break any existing tools that might depend on it. Change-Id: I939b21fa998c80cf921efeae3e8fa8c2b4ef4f50 (cherry picked from commit c2fb0b1)
1 parent b1da5a1 commit 4529b5b

File tree

3 files changed

+16
-12
lines changed

3 files changed

+16
-12
lines changed

doc/source/ovn/migration.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ adjustments, prepare the environment for the procedure.
2121

2222
Subsequent steps start the migration via Ansible.
2323

24-
Plan for a 24-hour wait after the setup-mtu-t1 step to allow VMs to catch up
25-
with the new MTU size. The default neutron ML2/OVS configuration has a
26-
dhcp_lease_duration of 86400 seconds (24h).
24+
Plan for a 24-hour wait after the reduce-dhcp-t1 step to allow VMs to catch up
25+
with the new MTU size from the DHCP server. The default neutron ML2/OVS
26+
configuration has a dhcp_lease_duration of 86400 seconds (24h).
2727

2828
Also, if there are instances using static IP assignment, the administrator
2929
should be ready to update the MTU of those instances to the new value of 8
@@ -182,11 +182,11 @@ Perform the following steps in the undercloud
182182
with the migration playbooks.
183183

184184

185-
6. Run ``ovn_migration.sh setup-mtu-t1``
185+
6. Run ``ovn_migration.sh reduce-dhcp-t1``
186186

187187
.. code-block:: console
188188
189-
$ ovn_migration.sh setup-mtu-t1
189+
$ ovn_migration.sh reduce-dhcp-t1
190190
191191
192192
This lowers the T1 parameter

tools/ovn_migration/infrared/tripleo-ovn-migration/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,10 +166,10 @@
166166
set -o pipefail &&
167167
{{ ovn_migration_working_dir }}/start-ovn-migration.sh generate-inventory 2>&1 > {{ ovn_migration_working_dir}}/generate-inventory.log
168168

169-
- name: Set MTU T1
169+
- name: Set DHCP T1 timer
170170
shell:
171171
set -o pipefail &&
172-
{{ ovn_migration_working_dir }}/start-ovn-migration.sh setup-mtu-t1 2>&1 > {{ ovn_migration_working_dir}}/setup-mtu-t1.log
172+
{{ ovn_migration_working_dir }}/start-ovn-migration.sh reduce-dhcp-t1 2>&1 > {{ ovn_migration_working_dir}}/reduce-dhcp-t1.log
173173

174174
- name: Reduce mtu of the pre migration networks
175175
shell:

tools/ovn_migration/tripleo_environment/ovn_migration.sh

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ EOF
238238
cat hosts_for_migration
239239
echo "***************************************"
240240
echo "Generated the inventory file - hosts_for_migration"
241-
echo "Please review the file before running the next command - setup-mtu-t1"
241+
echo "Please review the file before running the next command - reduce-dhcp-t1"
242242
}
243243

244244
# Check if source inventory exists
@@ -283,7 +283,7 @@ oc_check_network_mtu() {
283283
return $?
284284
}
285285

286-
setup_mtu_t1() {
286+
reduce_dhcp_t1() {
287287
# Run the ansible playbook to reduce the DHCP T1 parameter in
288288
# dhcp_agent.ini in all the overcloud nodes where dhcp agent is running.
289289
ansible-playbook -vv $OPT_WORKDIR/playbooks/reduce-dhcp-renewal-time.yml \
@@ -349,7 +349,7 @@ complete details. This script needs to be run in 5 steps.
349349
350350
Generates the inventory file
351351
352-
Step 2 -> ovn_migration.sh setup-mtu-t1
352+
Step 2 -> ovn_migration.sh reduce-dhcp-t1 (deprecated name setup-mtu-t1)
353353
354354
Sets the DHCP renewal T1 to 30 seconds. After this step you will
355355
need to wait at least 24h for the change to be propagated to all
@@ -386,9 +386,13 @@ case $command in
386386
ret_val=$?
387387
;;
388388

389-
setup-mtu-t1)
389+
reduce-dhcp-t1 | setup-mtu-t1)
390+
if [[ $command = 'setup-mtu-t1' ]]; then
391+
echo -e "Warning: setup-mtu-t1 argument was renamed."\
392+
"Use reduce-dhcp-t1 argument instead."
393+
fi
390394
check_for_necessary_files
391-
setup_mtu_t1
395+
reduce_dhcp_t1
392396
ret_val=$?;;
393397

394398
reduce-mtu)

0 commit comments

Comments
 (0)