openstack
/
neutron
Code Issues Proposed changes

Merge "Enhanced set of warnings if an answers file or a templates directory is used." into stable/ussuri

This commit is contained in:
Zuul 2021-11-24 12:00:07 +00:00 committed by Gerrit Code Review
parent 55de7e5471 ea00902575
commit 46a94978d8
1 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,27 +53,45 @@ check_for_necessary_files() {
if [ ! -e $OVERCLOUD_OVN_DEPLOY_SCRIPT ]; then if [ ! -e $OVERCLOUD_OVN_DEPLOY_SCRIPT ]; then
echo "overcloud deploy migration script :" \ echo "overcloud deploy migration script :" \
"$OVERCLOUD_OVN_DEPLOY_SCRIPT is not present. Please" \ "$OVERCLOUD_OVN_DEPLOY_SCRIPT is not present. Please" \
"make sure you generate that file before running this" "make sure you create that file before running this script."
exit 1 exit 1
fi fi
cat $OVERCLOUD_OVN_DEPLOY_SCRIPT | grep neutron-ovn >/dev/null grep -q -- '--answers-file' $OVERCLOUD_OVN_DEPLOY_SCRIPT || grep -q -- '--environment-directory' $OVERCLOUD_OVN_DEPLOY_SCRIPT
if [ "$?" == "1" ]; then answers_templates_check=$?
echo "OVN t-h-t environment file seems to be missing in \
$OVERCLOUD_OVN_DEPLOY_SCRIPT. Please check the $OVERCLOUD_OVN_DEPLOY_SCRIPT \ grep -q -- 'neutron-ovn' $OVERCLOUD_OVN_DEPLOY_SCRIPT
file again." if [[ $? -eq 1 ]]; then
exit 1 if [[ $answers_templates_check -eq 0 ]]; then
echo -e "\nWARNING!!! You are using an answers-file or a templates directory" \
" ( --answers-file/--environment-directory) " \
"\nYou MUST make sure the proper OVN files are included in the templates called by your deploy script"
else
echo -e "OVN t-h-t environment file(s) seems to be missing in " \
"$OVERCLOUD_OVN_DEPLOY_SCRIPT. Please check the $OVERCLOUD_OVN_DEPLOY_SCRIPT" \
"file again."
exit 1
fi
fi fi
cat $OVERCLOUD_OVN_DEPLOY_SCRIPT | grep \$HOME/ovn-extras.yaml >/dev/null grep -q \$HOME/ovn-extras.yaml $OVERCLOUD_OVN_DEPLOY_SCRIPT
check1=$? check1=$?
cat $OVERCLOUD_OVN_DEPLOY_SCRIPT | grep $HOME/ovn-extras.yaml >/dev/null grep -q $HOME/ovn-extras.yaml $OVERCLOUD_OVN_DEPLOY_SCRIPT
check2=$? check2=$?
if [[ "$check1" == "1" && "$check2" == "1" ]]; then if [[ $check1 -eq 1 && $check2 -eq 1 ]]; then
echo "ovn-extras.yaml file is missing in "\ # specific case of --answers-file/--environment-directory
"$OVERCLOUD_OVN_DEPLOY_SCRIPT. Please add it "\ if [[ $answers_templates_check -eq 0 ]]; then
"as \" -e \$HOME/ovn-extras.yaml\"" echo -e "\nWARNING!!! You are using an answers-file or a templates directory" \
" ( --answers-file/--environment-directory) " \
"\nYou MUST add ovn-extras.yaml to your new set of templates for OVN-based deploys." \
"\n e.g: add \" -e \$HOME/ovn-extras.yaml \" to the deploy command in $OVERCLOUD_OVN_DEPLOY_SCRIPT" \
"\nOnce OVN migration is finished, ovn-extras.yaml can then be safely removed from your OVN templates."
else
echo "ovn-extras.yaml file is missing in "\
"$OVERCLOUD_OVN_DEPLOY_SCRIPT. Please add it "\
"as \" -e \$HOME/ovn-extras.yaml\""
fi
exit 1 exit 1
fi fi
} }