Merge "Fix ovn-extras.yaml check on ovn_migration.sh"

4 years ago · 4c5cdc66e7
parent 5dcc4314de d0d06a80cd
commit 4c5cdc66e7
1 changed files with 7 additions and 3 deletions
--- a/migration/tripleo_environment/ovn_migration.sh
+++ b/migration/tripleo_environment/ovn_migration.sh
@ -63,11 +63,15 @@ file again."
        exit 1
    fi

-    cat $OVERCLOUD_OVN_DEPLOY_SCRIPT  | grep  $HOME/ovn-extras.yaml >/dev/null
-    if [ "$?" == "1" ]
+    cat $OVERCLOUD_OVN_DEPLOY_SCRIPT | grep \$HOME/ovn-extras.yaml >/dev/null
+    check1=$?
+    cat $OVERCLOUD_OVN_DEPLOY_SCRIPT | grep $HOME/ovn-extras.yaml >/dev/null
+    check2=$?
+
+    if [[ "$check1" == "1" && "$check2" == "1" ]]
    then
        echo "ovn-extras.yaml file is missing in $OVERCLOUD_OVN_DEPLOY_SCRIPT.\
- Please add it as \" -e $HOME/ovn-extras.yaml\""
+ Please add it as \" -e \$HOME/ovn-extras.yaml\""
        exit 1
    fi
 }