Fixed ec2 error on non-ec2 deployment

This commit is contained in:
Louwrentius 2010-03-01 22:07:19 +00:00
parent d1685d297c
commit 789db609c9
2 changed files with 5 additions and 5 deletions

6
ppss
View File

@ -843,7 +843,7 @@ ec2_launch_nodes() {
# Write all instances / nodes to the nodes file. # Write all instances / nodes to the nodes file.
# #
ec2-describe-instances | grep 'INSTANCE' | awk '{print $4}' | sed '/terminated/d' | sed '/pending/d' >> $NODES_FILE ec2-describe-instances | grep 'INSTANCE' | awk '{print $4}' | sed '/terminated/d' | sed '/pending/d' >> $NODES_FILE
NO_OF_NODES="`wc -l $NODES_FILE`" NO_OF_NODES="`wc -l $NODES_FILE | awk '{ print $1 }'`"
log DSPLY "Number of nodes / instances: $NO_OF_NODES" log DSPLY "Number of nodes / instances: $NO_OF_NODES"
} }
@ -948,7 +948,7 @@ deploy_ppss () {
cleanup cleanup
exit 1 exit 1
else else
if [ -z "$EC2" ] if [ "$EC2" == "1" ]
then then
ec2_launch_nodes ec2_launch_nodes
fi fi
@ -1919,7 +1919,7 @@ main () {
exit 0 exit 0
;; ;;
ec2) ec2)
EC2=true EC2=1
LOGFILE=/dev/null LOGFILE=/dev/null
display_header display_header
log INFO "Deploying PPSS on EC2 nodes." log INFO "Deploying PPSS on EC2 nodes."

View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
DEBUG="$1" DEBUG="$1"
VERSION="2.56b4" VERSION="2.57b1"
TMP_DIR="ppss" TMP_DIR="ppss"
PPSS=./ppss PPSS=./ppss
PPSS_DIR=ppss_dir PPSS_DIR=ppss_dir