You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ch...@apache.org on 2015/11/20 14:40:39 UTC
stratos git commit: Puppet - Changes related to MB HA configurations
in Puppet modules
Repository: stratos
Updated Branches:
refs/heads/stratos-4.1.x 4764bce5c -> a709cbce1
Puppet - Changes related to MB HA configurations in Puppet modules
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/a709cbce
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/a709cbce
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/a709cbce
Branch: refs/heads/stratos-4.1.x
Commit: a709cbce1c3575f53139c3acfbdfac0be3ef00a0
Parents: 4764bce
Author: Chamila de Alwis <ch...@apache.org>
Authored: Fri Nov 20 19:09:48 2015 +0530
Committer: Chamila de Alwis <ch...@apache.org>
Committed: Fri Nov 20 19:10:15 2015 +0530
----------------------------------------------------------------------
.../tests/MessageBrokerHATestCase.java | 2 +-
tools/puppet3/manifests/nodes/base.pp | 6 ++---
.../agent/templates/conf/jndi.properties.erb | 14 +++---------
.../templates/conf/mqtttopic.properties.erb | 2 +-
.../haproxy/templates/conf/jndi.properties.erb | 14 +++---------
.../lb/templates/conf/jndi.properties.erb | 14 +++---------
.../modules/python_agent/manifests/init.pp | 8 +++----
.../python_agent/templates/agent.conf.erb | 23 ++++----------------
8 files changed, 22 insertions(+), 61 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/a709cbce/products/python-cartridge-agent/modules/integration/test-integration/src/test/java/org/apache/stratos/python/cartridge/agent/integration/tests/MessageBrokerHATestCase.java
----------------------------------------------------------------------
diff --git a/products/python-cartridge-agent/modules/integration/test-integration/src/test/java/org/apache/stratos/python/cartridge/agent/integration/tests/MessageBrokerHATestCase.java b/products/python-cartridge-agent/modules/integration/test-integration/src/test/java/org/apache/stratos/python/cartridge/agent/integration/tests/MessageBrokerHATestCase.java
index 30ff703..e6203a7 100644
--- a/products/python-cartridge-agent/modules/integration/test-integration/src/test/java/org/apache/stratos/python/cartridge/agent/integration/tests/MessageBrokerHATestCase.java
+++ b/products/python-cartridge-agent/modules/integration/test-integration/src/test/java/org/apache/stratos/python/cartridge/agent/integration/tests/MessageBrokerHATestCase.java
@@ -38,7 +38,7 @@ import java.util.List;
import java.util.Properties;
/**
- * Created by chamilad on 11/11/15.
+ * Test case to test the messsage broker connection resilience in the Python Cartridge Agent
*/
public class MessageBrokerHATestCase extends PythonAgentIntegrationTest {
public MessageBrokerHATestCase() throws IOException {
http://git-wip-us.apache.org/repos/asf/stratos/blob/a709cbce/tools/puppet3/manifests/nodes/base.pp
----------------------------------------------------------------------
diff --git a/tools/puppet3/manifests/nodes/base.pp b/tools/puppet3/manifests/nodes/base.pp
index b15e463..e49ec3f 100755
--- a/tools/puppet3/manifests/nodes/base.pp
+++ b/tools/puppet3/manifests/nodes/base.pp
@@ -21,11 +21,11 @@ node 'base' {
#essential variables
$package_repo = 'http://10.4.128.7'
$local_package_dir = '/mnt/packs'
- $mb_url = 'tcp://127.0.0.1:1883'
+ $mb_urls = '127.0.0.1:1883' # comma separated list of MB URLs
$mb_type = 'activemq' #in wso2 mb case, value should be 'wso2mb'
+ $mb_username = ''
+ $mb_password = ''
$cep_urls = '127.0.0.1:7711' # comma separated list of CEP URLs
- $cep_ip = '127.0.0.1'
- $cep_port = '7711'
$cep_username = 'admin'
$cep_password = 'admin'
$truststore_password = 'wso2carbon'
http://git-wip-us.apache.org/repos/asf/stratos/blob/a709cbce/tools/puppet3/modules/agent/templates/conf/jndi.properties.erb
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/agent/templates/conf/jndi.properties.erb b/tools/puppet3/modules/agent/templates/conf/jndi.properties.erb
index b0bcbec..ff633db 100644
--- a/tools/puppet3/modules/agent/templates/conf/jndi.properties.erb
+++ b/tools/puppet3/modules/agent/templates/conf/jndi.properties.erb
@@ -20,15 +20,7 @@
# Please use loadbalancer.conf for updating mb-ip, mb-port and templates/jndi.properties.template
# file for updating other configurations.
#
-<% if @mb_type == 'wso2mb' %>
- connectionfactoryName=topicConnectionfactory
- connectionfactory.topicConnectionfactory=amqp://admin:admin@carbon/carbon?brokerlist='<%= @mb_url %>'
- java.naming.factory.initial=org.wso2.andes.jndi.PropertiesFileInitialContextFactory
- java.naming.provider.url=<%= @carbon_home %>/conf/jndi.properties
-<% end %>
-<% if @mb_type == 'activemq' %>
- connectionfactoryName=TopicConnectionFactory
- java.naming.provider.url=<%= @mb_url %>
- java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
-<% end %>
+connectionfactoryName=TopicConnectionFactory
+java.naming.provider.url=<%= @jndi_mb_string %>
+java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
http://git-wip-us.apache.org/repos/asf/stratos/blob/a709cbce/tools/puppet3/modules/agent/templates/conf/mqtttopic.properties.erb
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/agent/templates/conf/mqtttopic.properties.erb b/tools/puppet3/modules/agent/templates/conf/mqtttopic.properties.erb
index 963e301..3836ef3 100644
--- a/tools/puppet3/modules/agent/templates/conf/mqtttopic.properties.erb
+++ b/tools/puppet3/modules/agent/templates/conf/mqtttopic.properties.erb
@@ -16,6 +16,6 @@
# under the License.
#
-mqtturl=<%= @mb_url %>
+mqtturl=<%= @split_mburls[0] %>
clientID=stratos
tempfilelocation=/tmp
http://git-wip-us.apache.org/repos/asf/stratos/blob/a709cbce/tools/puppet3/modules/haproxy/templates/conf/jndi.properties.erb
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/haproxy/templates/conf/jndi.properties.erb b/tools/puppet3/modules/haproxy/templates/conf/jndi.properties.erb
index e4b4462..59b7f2f 100644
--- a/tools/puppet3/modules/haproxy/templates/conf/jndi.properties.erb
+++ b/tools/puppet3/modules/haproxy/templates/conf/jndi.properties.erb
@@ -20,14 +20,6 @@
# Please use loadbalancer.conf for updating mb-ip, mb-port and templates/jndi.properties.template
# file for updating other configurations.
#
-<% if @mb_type == 'wso2mb' %>
- connectionfactoryName=topicConnectionfactory
- connectionfactory.topicConnectionfactory=amqp://admin:admin@carbon/carbon?brokerlist='tcp://<%= @mb_ip %>:<%= @mb_port %>'
- java.naming.factory.initial=org.wso2.andes.jndi.PropertiesFileInitialContextFactory
- java.naming.provider.url=<%= @carbon_home %>/conf/jndi.properties
-<% end %>
-<% if @mb_type == 'activemq' %>
- connectionfactoryName=TopicConnectionFactory
- java.naming.provider.url=tcp://<%= @mb_ip %>:<%= @mb_port %>
- java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
-<% end %>
+connectionfactoryName=TopicConnectionFactory
+java.naming.provider.url=<%= @jndi_mb_string %>
+java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/a709cbce/tools/puppet3/modules/lb/templates/conf/jndi.properties.erb
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/lb/templates/conf/jndi.properties.erb b/tools/puppet3/modules/lb/templates/conf/jndi.properties.erb
index b0bcbec..ff633db 100644
--- a/tools/puppet3/modules/lb/templates/conf/jndi.properties.erb
+++ b/tools/puppet3/modules/lb/templates/conf/jndi.properties.erb
@@ -20,15 +20,7 @@
# Please use loadbalancer.conf for updating mb-ip, mb-port and templates/jndi.properties.template
# file for updating other configurations.
#
-<% if @mb_type == 'wso2mb' %>
- connectionfactoryName=topicConnectionfactory
- connectionfactory.topicConnectionfactory=amqp://admin:admin@carbon/carbon?brokerlist='<%= @mb_url %>'
- java.naming.factory.initial=org.wso2.andes.jndi.PropertiesFileInitialContextFactory
- java.naming.provider.url=<%= @carbon_home %>/conf/jndi.properties
-<% end %>
-<% if @mb_type == 'activemq' %>
- connectionfactoryName=TopicConnectionFactory
- java.naming.provider.url=<%= @mb_url %>
- java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
-<% end %>
+connectionfactoryName=TopicConnectionFactory
+java.naming.provider.url=<%= @jndi_mb_string %>
+java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
http://git-wip-us.apache.org/repos/asf/stratos/blob/a709cbce/tools/puppet3/modules/python_agent/manifests/init.pp
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/python_agent/manifests/init.pp b/tools/puppet3/modules/python_agent/manifests/init.pp
index 7ce7d77..886e255 100644
--- a/tools/puppet3/modules/python_agent/manifests/init.pp
+++ b/tools/puppet3/modules/python_agent/manifests/init.pp
@@ -34,10 +34,10 @@ class python_agent(
$agent_name = "apache-stratos-python-${service_code}-${version}"
$agent_home= "${target}/${agent_name}"
- $split_mburls = split($mb_url, "//")
- $split_mburl = split($split_mburls[1], ":")
- $mb_ip = $split_mburl[0]
- $mb_port = $split_mburl[1]
+ $split_mburls = split($mb_urls, ",")
+
+ # Generate the line for JNDI properties file -> failover:(tcp://host:port, tcp://host:port)
+ $jndi_mb_string = inline_template('failover:(<%= @split_mburls.map {|mb_url| "tcp://" + mb_url}.join(", ") %>)')
tag($service_code)
http://git-wip-us.apache.org/repos/asf/stratos/blob/a709cbce/tools/puppet3/modules/python_agent/templates/agent.conf.erb
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/python_agent/templates/agent.conf.erb b/tools/puppet3/modules/python_agent/templates/agent.conf.erb
index 56025c2..4450e65 100644
--- a/tools/puppet3/modules/python_agent/templates/agent.conf.erb
+++ b/tools/puppet3/modules/python_agent/templates/agent.conf.erb
@@ -16,8 +16,10 @@
# under the License.
[agent]
-mb.ip =<%= @mb_ip %>
-mb.port =<%= @mb_port %>
+mb.urls =<%= @mb_urls %>
+mb.username =<%= @mb_username %>
+mb.password =<%= @mb_password %>
+mb.publisher.timeout =900
listen.address =localhost
thrift.receiver.urls =<%= @cep_urls %>
thrift.server.admin.username =<%= @cep_username %>
@@ -43,20 +45,3 @@ APPLICATION_PATH =<%= @docroot %>
metadata.service.url =<%= @metadata_service_url %>
super.tenant.repository.path =/repository/deployment/server/
tenant.repository.path =/repository/tenants/
-extension.instance.started =instance-started.sh
-extension.start.servers =start-servers.sh
-extension.instance.activated =instance-activated.sh
-extension.artifacts.updated =artifacts-updated.sh
-extension.clean =clean.sh
-extension.mount.volumes =mount_volumes.sh
-extension.member.started =member-started.sh
-extension.member.activated =member-activated.sh
-extension.member.suspended =member-suspended.sh
-extension.member.terminated =member-terminated.sh
-extension.complete.topology =complete-topology.sh
-extension.complete.tenant =complete-tenant.sh
-extension.domain.mapping.added =domain-mapping-added.sh
-extension.domain.mapping.removed =domain-mapping-removed.sh
-extension.artifacts.copy =artifacts-copy.sh
-extension.tenant.subscribed =tenant-subscribed.sh
-extension.tenant.unsubscribed =tenant-unsubscribed.sh
\ No newline at end of file