From: Tim Rozet <trozet@redhat.com>
Date: Wed, 2 Sep 2015 16:28:49 +0000 (+0000)
Subject: Merge "Removes default vagrant route from virtual nodes"
X-Git-Tag: arno.2015.2.0~52^2^2~2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=ea46833abc02a09e9682d5bbbb7a8750667e7e6e;hp=-c;p=genesis.git

Merge "Removes default vagrant route from virtual nodes"
---

ea46833abc02a09e9682d5bbbb7a8750667e7e6e
diff --combined foreman/ci/deploy.sh
index 50a9dcf,46d4a96..dcead8b
--- a/foreman/ci/deploy.sh
+++ b/foreman/ci/deploy.sh
@@@ -30,7 -30,6 +30,7 @@@ declare -A admin_ip_ar
  declare -A public_ip_arr
  
  vm_dir=/var/opt/opnfv
 +script=`realpath $0`
  ##END VARS
  
  ##FUNCTIONS
@@@ -480,6 -479,7 +480,6 @@@ clean_tmp() 
  ##params: destination directory
  ##usage: clone_bgs /tmp/myvm/
  clone_bgs() {
 -  script=`realpath $0`
    script_dir="`dirname "$script"`"
    cp -fr $script_dir/ $1
    cp -fr $script_dir/../../common/puppet-opnfv $1
@@@ -993,6 -993,7 +993,6 @@@ start_virtual_nodes() 
      compute_wait_completed=false
  
      for node in ${nodes}; do
 -      cd /tmp/
  
        ##remove VM nodes incase it wasn't cleaned up
        rm -rf $vm_dir/$node
@@@ -1126,6 -1127,7 +1126,7 @@@
        if ! vagrant ssh -c "route | grep default | grep $this_default_gw"; then
          echo "${blue} Adding public route back to $node! ${reset}"
          vagrant ssh -c "route add default gw $this_default_gw"
+         vagrant ssh -c "route delete default gw 10.0.2.2"
        fi
        popd
      done