Code Review
/
genesis.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fixes issue with deploy copying from /tmp and clean bailing early
[genesis.git]
/
foreman
/
ci
/
deploy.sh
diff --git
a/foreman/ci/deploy.sh
b/foreman/ci/deploy.sh
index
9c1447b
..
50a9dcf
100755
(executable)
--- a/
foreman/ci/deploy.sh
+++ b/
foreman/ci/deploy.sh
@@
-30,6
+30,7
@@
declare -A admin_ip_arr
declare -A public_ip_arr
vm_dir=/var/opt/opnfv
declare -A public_ip_arr
vm_dir=/var/opt/opnfv
+script=`realpath $0`
##END VARS
##FUNCTIONS
##END VARS
##FUNCTIONS
@@
-479,7
+480,6
@@
clean_tmp() {
##params: destination directory
##usage: clone_bgs /tmp/myvm/
clone_bgs() {
##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
script_dir="`dirname "$script"`"
cp -fr $script_dir/ $1
cp -fr $script_dir/../../common/puppet-opnfv $1
@@
-993,7
+993,6
@@
start_virtual_nodes() {
compute_wait_completed=false
for node in ${nodes}; do
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
##remove VM nodes incase it wasn't cleaned up
rm -rf $vm_dir/$node