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/12/03 12:27:20 UTC

[1/2] git commit: Added a sample static topology configuration to loadbalancer.conf

Updated Branches:
  refs/heads/master b2f56c86f -> 7701b25b3


Added a sample static topology configuration to loadbalancer.conf


Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/090ee3c1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/090ee3c1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/090ee3c1

Branch: refs/heads/master
Commit: 090ee3c17b214b2001c2bcc8ccc8c57a79b3bdba
Parents: 762394b
Author: Imesh Gunaratne <im...@apache.org>
Authored: Tue Dec 3 16:56:59 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Tue Dec 3 16:56:59 2013 +0530

----------------------------------------------------------------------
 .../src/main/conf/loadbalancer.conf             | 43 ++++++++++++++++++++
 1 file changed, 43 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/090ee3c1/products/load-balancer/modules/distribution/src/main/conf/loadbalancer.conf
----------------------------------------------------------------------
diff --git a/products/load-balancer/modules/distribution/src/main/conf/loadbalancer.conf b/products/load-balancer/modules/distribution/src/main/conf/loadbalancer.conf
index 87d71dc..14c3f3b 100644
--- a/products/load-balancer/modules/distribution/src/main/conf/loadbalancer.conf
+++ b/products/load-balancer/modules/distribution/src/main/conf/loadbalancer.conf
@@ -71,4 +71,47 @@ loadbalancer {
             class-name: org.apache.stratos.load.balancer.algorithm.RoundRobin;
         }
     }
+
+    # Static topology configuration
+    # Define a static topology configuration if topology-event-listener-enabled is set to false.
+    # A sample configuration has been given below:
+    #
+    # services {
+    #     app-server {  # service name, a unique identifier to identify a service
+    #         clusters {
+    #             app-server-cluster1 {  # cluster id, a unique identifier to identify a cluster
+    #                 hosts: cluster1.appserver.foo.org, cluster1.org;  # comma separated hostname list
+    #                 algorithm: round-robin;  # algorithm name
+    #                 members {
+    #                     m1 {  # member id, a unique identifier to identify a member
+    #                         ip: 10.0.0.10; # member ip address
+    #                         ports {
+    #                             http {
+    #                                 value: 8080; # application port
+    #                                 proxy: 80;   # proxy port exposed by load balancer transport, set this value in axis2.xml
+    #                             }
+    #                             https {
+    #                                 value: 8090;
+    #                                 proxy: 443;
+    #                             }
+    #                         }
+    #                     }
+    #                     m2 {
+    #                         ip: 10.0.0.11;
+    #                         ports {
+    #                             http {
+    #                                 value: 8080;
+    #                                 proxy: 80;
+    #                             }
+    #                             https {
+    #                                 value: 8090;
+    #                                 proxy: 443;
+    #                             }
+    #                         }
+    #                     }
+    #                 }
+    #             }
+    #         }
+    #     }
+    # }
 }


[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/7701b25b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/7701b25b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/7701b25b

Branch: refs/heads/master
Commit: 7701b25b3a64e4ca57fcf282958cde18ed265615
Parents: 090ee3c b2f56c8
Author: Imesh Gunaratne <im...@apache.org>
Authored: Tue Dec 3 16:57:13 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Tue Dec 3 16:57:13 2013 +0530

----------------------------------------------------------------------
 tools/stratos-installer/conf/setup.conf         | 14 ++++
 .../config/cep/repository/conf/jndi.properties  | 13 ++++
 tools/stratos-installer/setup.sh                | 67 +++++++++++++++++++-
 tools/stratos-installer/start-servers.sh        | 15 ++++-
 4 files changed, 106 insertions(+), 3 deletions(-)
----------------------------------------------------------------------