You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2013/12/20 12:04:00 UTC
[1/2] git commit: committing cartridge-agent.sh with support for
single cartridge agent pack
Updated Branches:
refs/heads/master d47982584 -> 14aace7cf
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/bff7903d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/bff7903d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/bff7903d
Branch: refs/heads/master
Commit: bff7903d069d5f19c26f8bbb988924dbdfe77126
Parents: a2a7af9
Author: Isuru <is...@wso2.com>
Authored: Fri Dec 20 16:33:32 2013 +0530
Committer: Isuru <is...@wso2.com>
Committed: Fri Dec 20 16:33:32 2013 +0530
----------------------------------------------------------------------
.../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/bff7903d/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
#------------------------------------
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by is...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/14aace7c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/14aace7c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/14aace7c
Branch: refs/heads/master
Commit: 14aace7cfe6d23305b9a0e325a28c5ad4c2d477a
Parents: bff7903 d479825
Author: Isuru <is...@wso2.com>
Authored: Fri Dec 20 16:33:41 2013 +0530
Committer: Isuru <is...@wso2.com>
Committed: Fri Dec 20 16:33:41 2013 +0530
----------------------------------------------------------------------
.../publisher/CartridgeAgentEventPublisher.java | 78 +++++++++++++-------
.../publisher/HealthStatisticsPublisher.java | 4 +-
.../java/org/apache/stratos/cli/RestClient.java | 52 ++-----------
.../stratos/cli/RestCommandLineService.java | 60 ++++++++-------
.../publisher/WSO2CEPStatisticsPublisher.java | 10 +--
.../conf/configurator/CEPConfigurator.java | 2 +-
.../health/stat/AverageLoadAverageEvent.java | 6 +-
.../stat/AverageMemoryConsumptionEvent.java | 6 +-
.../stat/AverageRequestsInFlightEvent.java | 6 +-
.../health/stat/GradientOfLoadAverageEvent.java | 6 +-
.../stat/GradientOfMemoryConsumptionEvent.java | 6 +-
.../stat/GradientOfRequestsInFlightEvent.java | 6 +-
.../event/health/stat/HealthStatEvent.java | 32 ++++++++
.../stat/MemberAverageLoadAverageEvent.java | 6 +-
.../MemberAverageMemoryConsumptionEvent.java | 6 +-
.../event/health/stat/MemberFaultEvent.java | 6 +-
.../stat/MemberGradientOfLoadAverageEvent.java | 6 +-
.../MemberGradientOfMemoryConsumptionEvent.java | 6 +-
...emberSecondDerivativeOfLoadAverageEvent.java | 6 +-
...econdDerivativeOfMemoryConsumptionEvent.java | 6 +-
.../SecondDerivativeOfLoadAverageEvent.java | 5 +-
...econdDerivativeOfMemoryConsumptionEvent.java | 6 +-
...SecondDerivativeOfRequestsInFlightEvent.java | 6 +-
.../AverageLoadAverageMessageProcessor.java | 66 +++++++++++++++++
...verageMemoryConsumptionMessageProcessor.java | 66 +++++++++++++++++
...AverageRequestsInFlightMessageProcessor.java | 66 +++++++++++++++++
.../GradientOfLoadAverageMessageProcessor.java | 66 +++++++++++++++++
...ientOfMemoryConsumptionMessageProcessor.java | 65 ++++++++++++++++
...dientOfRequestsInFlightMessageProcessor.java | 66 +++++++++++++++++
...emberAverageLoadAverageMessageProcessor.java | 66 +++++++++++++++++
...verageMemoryConsumptionMessageProcessor.java | 66 +++++++++++++++++
.../stat/MemberFaultMessageProcessor.java | 66 +++++++++++++++++
...erGradientOfLoadAverageMessageProcessor.java | 66 +++++++++++++++++
...ientOfMemoryConsumptionMessageProcessor.java | 67 +++++++++++++++++
...DerivativeOfLoadAverageMessageProcessor.java | 66 +++++++++++++++++
...tiveOfMemoryConsumptionMessageProcessor.java | 66 +++++++++++++++++
...DerivativeOfLoadAverageMessageProcessor.java | 66 +++++++++++++++++
...tiveOfMemoryConsumptionMessageProcessor.java | 66 +++++++++++++++++
...ativeOfRequestsInFlightMessageProcessor.java | 66 +++++++++++++++++
.../src/main/bin/haproxy-extension.sh | 2 +-
.../src/main/bin/cartridge-agent.sh | 11 +--
41 files changed, 1225 insertions(+), 177 deletions(-)
----------------------------------------------------------------------