committing cartridge-agent.sh with support for single cartridge agent pack
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/6e62121d Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/6e62121d Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/6e62121d Branch: refs/heads/master Commit: 6e62121d1ff13ff41e09491587061e34d87c1d7d Parents: 2f8a008 Author: Isuru <[email protected]> Authored: Fri Dec 20 16:33:32 2013 +0530 Committer: Udara Liyanage <[email protected]> Committed: Fri Dec 20 20:25:37 2013 -0500 ---------------------------------------------------------------------- .../modules/scripts/ec2/cartridge-agent.sh | 36 +++++++++++++++++--- 1 file changed, 31 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6e62121d/products/cartridge-agent/modules/scripts/ec2/cartridge-agent.sh ---------------------------------------------------------------------- diff --git a/products/cartridge-agent/modules/scripts/ec2/cartridge-agent.sh b/products/cartridge-agent/modules/scripts/ec2/cartridge-agent.sh index 2f774e0..b8c3d3a 100755 --- a/products/cartridge-agent/modules/scripts/ec2/cartridge-agent.sh +++ b/products/cartridge-agent/modules/scripts/ec2/cartridge-agent.sh @@ -24,14 +24,19 @@ # instance is spawned. It will initiate all the tasks that needs to # be run to bring the cartridge instance to operational state. +source /etc/environment + set -e # Terminate on any error export LOG=/var/log/apache-stratos/cartridge-agent-sh.log instance_path=/opt/apache-stratos-cartridge-agent # Cartridge agent home ca_exec_path=${instance_path}/cartridge-agent # Cartridge agent executable home +temp_payload_path=/tmp/payload/launch-params +puppet_payload_path=/tmp/puppet-payload +cartridge_agent_script=cartridge-agent.sh -#----- +#--------------------------------------------- # Unzip cartridge agent pack -#----- +#--------------------------------------------- pushd ${instance_path} unzip apache-stratos-cartridge-agent-4.0.0-SNAPSHOT-bin.zip mv apache-stratos-cartridge-agent-4.0.0-SNAPSHOT cartridge-agent @@ -45,8 +50,14 @@ 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.txt - echo "payload copied" | tee -a $LOG + #wget http://169.254.169.254/latest/user-data -O ${instance_path}/payload/launch-params -- payload already downloaded + #echo "payload copied" | tee -a $LOG + + # Concat puppet payload and instance payload into ${instance_path}/payload/launch-params + #Read puppet configs + puppet_config=`cat /tmp/puppet-payload` + echo "puppet_config" + sed "s|$|${puppet_config}|" ${temp_payload_path} > ${instance_path}/payload/launch-params for i in `/usr/bin/ruby ${instance_path}/get-launch-params.rb` do @@ -59,11 +70,26 @@ if [ ! -d ${instance_path}/payload ]; then fi echo "writing to launch.params ${value}" | tee -a $LOG echo "export" ${value} >> ${instance_path}/launch.params - done + done + fi source ${instance_path}/launch.params +pushd $ca_exec_path +echo "Configuring cartridge agent executable..." | tee -a $LOG +cp -f bin/$cartridge_agent_script bin/$cartridge_agent_script.tmp +cat bin/$cartridge_agent_script.tmp | sed -e "s@MB-IP@$MB_IP@g" > bin/$cartridge_agent_script +cp -f bin/$cartridge_agent_script bin/$cartridge_agent_script.tmp +cat bin/$cartridge_agent_script.tmp | sed -e "s@MB-PORT@$MB_PORT@g" > bin/$cartridge_agent_script +cp -f bin/$cartridge_agent_script bin/$cartridge_agent_script.tmp +cat bin/$cartridge_agent_script.tmp | sed -e "s@CEP-IP@$CEP_IP@g" > bin/$cartridge_agent_script +cp -f bin/$cartridge_agent_script bin/$cartridge_agent_script.tmp +cat bin/$cartridge_agent_script.tmp | sed -e "s@CEP-PORT@$CEP_PORT@g" > bin/$cartridge_agent_script +rm -f bin/$cartridge_agent_script.tmp +popd + + #------------------------------------ # Starting cartridge agent executable #------------------------------------
