You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2013/11/17 20:23:30 UTC
[1/2] git commit: Added message broker configuration to haproxy
extension installation guide
Updated Branches:
refs/heads/master bd279632c -> 5894018c4
Added message broker configuration to haproxy extension installation guide
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/be8a4dd5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/be8a4dd5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/be8a4dd5
Branch: refs/heads/master
Commit: be8a4dd5da9b638cd5bd28fea1d4c3786e083d55
Parents: 94d8f91
Author: Imesh Gunaratne <im...@apache.org>
Authored: Mon Nov 18 00:10:18 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Mon Nov 18 00:10:18 2013 +0530
----------------------------------------------------------------------
extensions/load-balancer/haproxy-extension/INSTALL.txt | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/be8a4dd5/extensions/load-balancer/haproxy-extension/INSTALL.txt
----------------------------------------------------------------------
diff --git a/extensions/load-balancer/haproxy-extension/INSTALL.txt b/extensions/load-balancer/haproxy-extension/INSTALL.txt
index ef9e3dc..ab513ad 100644
--- a/extensions/load-balancer/haproxy-extension/INSTALL.txt
+++ b/extensions/load-balancer/haproxy-extension/INSTALL.txt
@@ -10,14 +10,18 @@ below steps to proceed with the installation:
2. Extract apache-stratos-haproxy-extension-4.0.0-SNAPSHOT-bin.zip to a desired location: <HAPROXY-EXTENSION-HOME>.
-3. Open <HAPROXY-EXTENSION-HOME>/bin/haproxy-extension.sh in a text editor and update following system properties:
-
+3. Open <HAPROXY-EXTENSION-HOME>/bin/haproxy-extension.sh file in a text editor and update following system properties:
-Dexecutable.file.path=<HAPROXY-HOME>/haproxy # HAProxy executable file path
-Dconf.file.path=/tmp/haproxy.cfg # HAProxy configuration file path
-Dstats.socket.file.path=/tmp/haproxy-stats.socket # HAProxy statistics socket file path
-Dthrift.receiver.ip=localhost # CEP IP Address
-Dthrift.receiver.port=7615 # CEP Port
+4. Open <HAPROXY-EXTENSION-HOME>/conf/jndi.properties file in a text editor and update message broker information:
+ connectionfactory.topicConnectionfactory=amqp://admin:admin@carbon/carbon?brokerlist='tcp://<message-broker-ip>:<message-broker-port>'
+
+5. Run <HAPROXY-EXTENSION-HOME>/bin/haproxy-extension.sh
+
Thank you for using Apache Stratos!
Apache Stratos Team
[2/2] git commit: Merge remote-tracking branch 'origin/master'
Posted by im...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/5894018c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/5894018c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/5894018c
Branch: refs/heads/master
Commit: 5894018c4782efa02e6770049c2a5810ce06be18
Parents: be8a4dd bd27963
Author: Imesh Gunaratne <im...@apache.org>
Authored: Mon Nov 18 00:53:19 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Mon Nov 18 00:53:19 2013 +0530
----------------------------------------------------------------------
.../stratos/autoscaler/ClusterContext.java | 5 +-
.../algorithm/AutoscaleAlgorithm.java | 2 -
.../autoscaler/algorithm/OneAfterAnother.java | 149 ++++++++-----------
.../autoscaler/algorithm/RoundRobin.java | 8 +-
.../impl/CloudControllerServiceImpl.java | 1 -
5 files changed, 65 insertions(+), 100 deletions(-)
----------------------------------------------------------------------