Updated Branches: refs/heads/master fcf1dc7fa -> 00569d41e
Fixed cartridge-agent.sh logic according to changes done in auto-scaler/cloud-controller Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/8d26bfbf Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/8d26bfbf Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/8d26bfbf Branch: refs/heads/master Commit: 8d26bfbfc12c968214073a9dcab63e45d65a2260 Parents: b1999c5 Author: Imesh Gunaratne <[email protected]> Authored: Tue Dec 3 22:04:27 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Tue Dec 3 22:04:27 2013 +0530 ---------------------------------------------------------------------- .../modules/cartridge-agent/ec2/php/cartridge-agent.sh | 4 +--- .../modules/cartridge-agent/ec2/tomcat/cartridge-agent.sh | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8d26bfbf/products/cartridge-agent/modules/cartridge-agent/ec2/php/cartridge-agent.sh ---------------------------------------------------------------------- diff --git a/products/cartridge-agent/modules/cartridge-agent/ec2/php/cartridge-agent.sh b/products/cartridge-agent/modules/cartridge-agent/ec2/php/cartridge-agent.sh index 13fa2e2..3b47504 100755 --- a/products/cartridge-agent/modules/cartridge-agent/ec2/php/cartridge-agent.sh +++ b/products/cartridge-agent/modules/cartridge-agent/ec2/php/cartridge-agent.sh @@ -38,10 +38,8 @@ if [ ! -d ${instance_path}/payload ]; then echo "creating payload directory... " | tee -a $LOG mkdir ${instance_path}/payload echo "payload directory created" | tee -a $LOG - wget http://169.254.169.254/latest/user-data -O ${instance_path}/payload/payload.zip + wget http://169.254.169.254/latest/user-data -O ${instance_path}/payload/launch-params echo "payload copied" | tee -a $LOG - unzip -d ${instance_path}/payload ${instance_path}/payload/payload.zip - echo "unzipped" | tee -a $LOG for i in `/usr/bin/ruby ${instance_path}/get-launch-params.rb` do http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8d26bfbf/products/cartridge-agent/modules/cartridge-agent/ec2/tomcat/cartridge-agent.sh ---------------------------------------------------------------------- diff --git a/products/cartridge-agent/modules/cartridge-agent/ec2/tomcat/cartridge-agent.sh b/products/cartridge-agent/modules/cartridge-agent/ec2/tomcat/cartridge-agent.sh index 1cb298d..4f640fd 100755 --- a/products/cartridge-agent/modules/cartridge-agent/ec2/tomcat/cartridge-agent.sh +++ b/products/cartridge-agent/modules/cartridge-agent/ec2/tomcat/cartridge-agent.sh @@ -36,10 +36,8 @@ if [ ! -d ${instance_path}/payload ]; then echo "creating payload directory... " | tee -a $LOG mkdir ${instance_path}/payload echo "payload directory created" | tee -a $LOG - wget http://169.254.169.254/latest/user-data -O ${instance_path}/payload/payload.zip + wget http://169.254.169.254/latest/user-data -O ${instance_path}/payload/launch-params echo "payload copied" | tee -a $LOG - unzip -d ${instance_path}/payload ${instance_path}/payload/payload.zip - echo "unzipped" | tee -a $LOG for i in `/usr/bin/ruby ${instance_path}/get-launch-params.rb` do
