You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ni...@apache.org on 2014/03/29 15:39:32 UTC
[1/5] git commit: synching latest agent script with puppet template
Repository: incubator-stratos
Updated Branches:
refs/heads/master 3d526faa1 -> 81a1c06c8
synching latest agent script with puppet template
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/fc485883
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/fc485883
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/fc485883
Branch: refs/heads/master
Commit: fc4858834b61132eba51c116f60d99af4497a3d7
Parents: 3d526fa
Author: Nirmal Fernando <ni...@apache.org>
Authored: Sat Mar 29 19:48:20 2014 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Sat Mar 29 19:48:20 2014 +0530
----------------------------------------------------------------------
tools/puppet3/modules/agent/templates/bin/stratos.sh.erb | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/fc485883/tools/puppet3/modules/agent/templates/bin/stratos.sh.erb
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/agent/templates/bin/stratos.sh.erb b/tools/puppet3/modules/agent/templates/bin/stratos.sh.erb
index 8be122a..02814f9 100644
--- a/tools/puppet3/modules/agent/templates/bin/stratos.sh.erb
+++ b/tools/puppet3/modules/agent/templates/bin/stratos.sh.erb
@@ -26,6 +26,7 @@ lib_path=${script_path}/../lib/
class_path=`echo ${lib_path}/*.jar | tr ' ' ':'`
properties="-Dmb.ip=<%= @mb_ip %>
-Dmb.port=<%= @mb_port %>
+ -Dlisten.address=localhost
-Dthrift.receiver.ip=<%= @cep_ip %>
-Dthrift.receiver.port=<%= @cep_port %>
-Djndi.properties.template.file.path=<%= @carbon_home %>/conf/templates/jndi.properties.template
@@ -33,12 +34,17 @@ properties="-Dmb.ip=<%= @mb_ip %>
-Dlog4j.properties.file.path=<%= @carbon_home %>/conf/log4j.properties
-Dparam.file.path=<%= @carbon_home %>/payload/launch-params
-Dextensions.dir=${script_path}/../extensions
- -Dagent.flow.file.path=${script_path}/../conf/agent-flow.conf
-Dcep.stats.publisher.enabled=true
-Djavax.net.ssl.trustStore=<%= @carbon_home %>/security/client-truststore.jks
-Djavax.net.ssl.trustStorePassword=<%= @truststore_password %>
-Denable.artifact.update=true
-Dartifact.update.interval=15
+ -Denable.data.publisher=<%= @enable_log_publisher %>
+ -Dmonitoring.server.ip=<%= @bam_ip %>
+ -Dmonitoring.server.port=<%= @bam_port %>
+ -Dmonitoring.server.secure.port=<%= @bam_secure_port %>
+ -Dmonitoring.server.admin.username=<%= @bam_username %>
+ -Dmonitoring.server.admin.password=<%= @bam_password %>
-DAPP_PATH=<%= @docroot %>"
# Uncomment below line to enable remote debugging
[5/5] git commit: changing default values correctly
Posted by ni...@apache.org.
changing default values correctly
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/81a1c06c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/81a1c06c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/81a1c06c
Branch: refs/heads/master
Commit: 81a1c06c892144c8481983c2081fb00d47ba74c5
Parents: e8c18a6
Author: Nirmal Fernando <ni...@apache.org>
Authored: Sat Mar 29 20:09:12 2014 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Sat Mar 29 20:09:12 2014 +0530
----------------------------------------------------------------------
tools/puppet3/manifests/nodes.pp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/81a1c06c/tools/puppet3/manifests/nodes.pp
----------------------------------------------------------------------
diff --git a/tools/puppet3/manifests/nodes.pp b/tools/puppet3/manifests/nodes.pp
index f226088..dda9557 100644
--- a/tools/puppet3/manifests/nodes.pp
+++ b/tools/puppet3/manifests/nodes.pp
@@ -3,11 +3,11 @@ node 'base' {
#essential variables
$package_repo = 'http://10.4.128.7'
$local_package_dir = '/mnt/packs'
- $mb_ip = '54.255.43.95'
- $mb_port = '5677'
+ $mb_ip = '127.0.0.1'
+ $mb_port = '61616'
$mb_type = 'activemq' #in wso2 mb case, value should be 'wso2mb'
- $cep_ip = '54.255.43.95'
- $cep_port = '7615'
+ $cep_ip = '127.0.0.1'
+ $cep_port = '7611'
$truststore_password = 'wso2carbon'
$java_distribution = 'jdk-7u7-linux-x64.tar.gz'
$java_name = 'jdk1.7.0_07'
@@ -18,7 +18,7 @@ node 'base' {
$enable_log_publisher = 'false'
$bam_ip = '127.0.0.1'
$bam_port = '7611'
- $bam_secure_port = '7615'
+ $bam_secure_port = '7711'
$bam_username = 'admin'
$bam_password = 'admin'
[3/5] git commit: copying mb client libs depending on the mb type
Posted by ni...@apache.org.
copying mb client libs depending on the mb type
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/a1625f8d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/a1625f8d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/a1625f8d
Branch: refs/heads/master
Commit: a1625f8d437f7d84772e05735fa4c59aee9b3413
Parents: ea98e13
Author: Nirmal Fernando <ni...@apache.org>
Authored: Sat Mar 29 19:49:27 2014 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Sat Mar 29 19:49:27 2014 +0530
----------------------------------------------------------------------
tools/puppet3/modules/agent/manifests/initialize.pp | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a1625f8d/tools/puppet3/modules/agent/manifests/initialize.pp
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/agent/manifests/initialize.pp b/tools/puppet3/modules/agent/manifests/initialize.pp
index ded6988..67d1d43 100755
--- a/tools/puppet3/modules/agent/manifests/initialize.pp
+++ b/tools/puppet3/modules/agent/manifests/initialize.pp
@@ -66,5 +66,15 @@ define agent::initialize ($repo, $version, $service, $local_dir, $target, $owner
logoutput => 'on_failure',
timeout => 0,
require => Exec["extracting_stratos${service}-${version}.zip_for_${name}"];
+
+ }
+
+ file { '${target}/apache-stratos-${service}-${version}/lib':
+ path => '${target}/apache-stratos-${service}-${version}/lib',
+ ensure => directory,
+ require => Exec["setting_permission_for_${name}"],
+ source => ['puppet:///modules/agent/${mb_type}'],
+ sourceselect => all,
+ recurse => true,
}
}
[4/5] git commit: adding a README to files folder of agent,
to explain what should be added there
Posted by ni...@apache.org.
adding a README to files folder of agent, to explain what should be added there
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/e8c18a63
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/e8c18a63
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/e8c18a63
Branch: refs/heads/master
Commit: e8c18a63e8f3b96f17efbf747cba215149aabc80
Parents: a1625f8
Author: Nirmal Fernando <ni...@apache.org>
Authored: Sat Mar 29 20:07:23 2014 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Sat Mar 29 20:07:23 2014 +0530
----------------------------------------------------------------------
tools/puppet3/modules/agent/files/README.txt | 12 ++++++++++++
1 file changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e8c18a63/tools/puppet3/modules/agent/files/README.txt
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/agent/files/README.txt b/tools/puppet3/modules/agent/files/README.txt
new file mode 100644
index 0000000..88c8daf
--- /dev/null
+++ b/tools/puppet3/modules/agent/files/README.txt
@@ -0,0 +1,12 @@
+This folder should have following:
+
+1. apache-stratos-cartridge-agent-${version}-bin.zip file
+
+2. Folder having a name as $mb_type which is defined in the nodes.pp file.
+
+eg:
+if $mb_type = activemq, folder structure of this folder would be:
+>$ls
+>activemq apache-stratos-cartridge-agent-4.0.0-SNAPSHOT-bin.zip
+
+3. Under $mb_type folder, please add all the client jars, that should be copied to the agent's lib directory.
[2/5] git commit: latest changes to nodes.pp - logging publisher
params
Posted by ni...@apache.org.
latest changes to nodes.pp - logging publisher params
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/ea98e139
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/ea98e139
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/ea98e139
Branch: refs/heads/master
Commit: ea98e139467643acb539e252facb8c9fa0784679
Parents: fc48588
Author: Nirmal Fernando <ni...@apache.org>
Authored: Sat Mar 29 19:48:54 2014 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Sat Mar 29 19:48:54 2014 +0530
----------------------------------------------------------------------
tools/puppet3/manifests/nodes.pp | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ea98e139/tools/puppet3/manifests/nodes.pp
----------------------------------------------------------------------
diff --git a/tools/puppet3/manifests/nodes.pp b/tools/puppet3/manifests/nodes.pp
index d07deef..f226088 100644
--- a/tools/puppet3/manifests/nodes.pp
+++ b/tools/puppet3/manifests/nodes.pp
@@ -15,6 +15,13 @@ node 'base' {
$lb_httpPort = '80'
$lb_httpsPort = '443'
$tomcat_version = '7.0.52'
+ $enable_log_publisher = 'false'
+ $bam_ip = '127.0.0.1'
+ $bam_port = '7611'
+ $bam_secure_port = '7615'
+ $bam_username = 'admin'
+ $bam_password = 'admin'
+
}