Browse Source

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

tags/6.0.0.0b1
Zuul 3 months ago
parent
commit
4c5cdc66e7
1 changed files with 7 additions and 3 deletions
  1. 7
    3
      migration/tripleo_environment/ovn_migration.sh

+ 7
- 3
migration/tripleo_environment/ovn_migration.sh View File

@@ -63,11 +63,15 @@ file again."
63 63
         exit 1
64 64
     fi
65 65
 
66
-    cat $OVERCLOUD_OVN_DEPLOY_SCRIPT  | grep  $HOME/ovn-extras.yaml >/dev/null
67
-    if [ "$?" == "1" ]
66
+    cat $OVERCLOUD_OVN_DEPLOY_SCRIPT | grep \$HOME/ovn-extras.yaml >/dev/null
67
+    check1=$?
68
+    cat $OVERCLOUD_OVN_DEPLOY_SCRIPT | grep $HOME/ovn-extras.yaml >/dev/null
69
+    check2=$?
70
+
71
+    if [[ "$check1" == "1" && "$check2" == "1" ]]
68 72
     then
69 73
         echo "ovn-extras.yaml file is missing in $OVERCLOUD_OVN_DEPLOY_SCRIPT.\
70
- Please add it as \" -e $HOME/ovn-extras.yaml\""
74
+ Please add it as \" -e \$HOME/ovn-extras.yaml\""
71 75
         exit 1
72 76
     fi
73 77
 }

Loading…
Cancel
Save