You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ma...@apache.org on 2014/11/10 17:10:46 UTC
[1/3] stratos git commit: Puppet: Removed java dependencies,
Updated python agent templates Python Agent: Cluster's memberPublicIp
made optional
Repository: stratos
Updated Branches:
refs/heads/master b5274239a -> c88a50606
Puppet: Removed java dependencies, Updated python agent templates
Python Agent: Cluster's memberPublicIp made optional
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/b7e16d4b
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/b7e16d4b
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/b7e16d4b
Branch: refs/heads/master
Commit: b7e16d4b835c23b320a6260df0365733fae4fe29
Parents: 8080662
Author: Chamila de Alwis <cs...@chamiladealwis.com>
Authored: Mon Nov 10 17:26:12 2014 +0530
Committer: Chamila de Alwis <cs...@chamiladealwis.com>
Committed: Mon Nov 10 17:26:12 2014 +0530
----------------------------------------------------------------------
.../cartridgeagent/modules/event/topology/events.py | 2 +-
tools/puppet3/manifests/nodes/base.pp | 2 ++
tools/puppet3/modules/mysql/manifests/init.pp | 2 --
tools/puppet3/modules/nodejs/manifests/init.pp | 2 --
tools/puppet3/modules/php/manifests/init.pp | 2 --
tools/puppet3/modules/python_agent/templates/agent.conf.erb | 3 +++
tools/puppet3/modules/ruby/manifests/init.pp | 2 --
tools/puppet3/modules/wordpress/manifests/init.pp | 3 +--
8 files changed, 7 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/b7e16d4b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/event/topology/events.py
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/event/topology/events.py b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/event/topology/events.py
index 52c7c19..150f1d1 100644
--- a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/event/topology/events.py
+++ b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/event/topology/events.py
@@ -184,7 +184,7 @@ class CompleteTopologyEvent:
mm_partition_id = member_str["partitionId"] if "partitionId" in member_str else None
member_obj = Member(mm_service_name, mm_cluster_id, mm_network_partition_id, mm_partition_id, member_id)
- member_obj.member_public_ip = member_str["memberPublicIp"]
+ member_obj.member_public_ip = member_str["memberPublicIp"] if "memberPublicIp" in member_str else None
member_obj.status = member_str["status"]
member_obj.member_ip = member_str["memberIp"]
member_obj.properties = member_str["properties"]
http://git-wip-us.apache.org/repos/asf/stratos/blob/b7e16d4b/tools/puppet3/manifests/nodes/base.pp
----------------------------------------------------------------------
diff --git a/tools/puppet3/manifests/nodes/base.pp b/tools/puppet3/manifests/nodes/base.pp
index ebc1aa5..f8a2cf7 100755
--- a/tools/puppet3/manifests/nodes/base.pp
+++ b/tools/puppet3/manifests/nodes/base.pp
@@ -25,6 +25,8 @@ node 'base' {
$mb_type = 'activemq' #in wso2 mb case, value should be 'wso2mb'
$cep_ip = '127.0.0.1'
$cep_port = '7611'
+ $cep_username ='admin'
+ $cep_password ='admin'
$truststore_password = 'wso2carbon'
$java_distribution = 'jdk-7u51-linux-x64.tar.gz'
$java_name = 'jdk1.7.0_51'
http://git-wip-us.apache.org/repos/asf/stratos/blob/b7e16d4b/tools/puppet3/modules/mysql/manifests/init.pp
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/mysql/manifests/init.pp b/tools/puppet3/modules/mysql/manifests/init.pp
index d423bcd..dd9ab76 100644
--- a/tools/puppet3/modules/mysql/manifests/init.pp
+++ b/tools/puppet3/modules/mysql/manifests/init.pp
@@ -17,8 +17,6 @@
class mysql{
- require java
-
$custom_agent_templates = ['extensions/instance-started.sh']
class {'python_agent':
custom_templates => $custom_agent_templates,
http://git-wip-us.apache.org/repos/asf/stratos/blob/b7e16d4b/tools/puppet3/modules/nodejs/manifests/init.pp
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/nodejs/manifests/init.pp b/tools/puppet3/modules/nodejs/manifests/init.pp
index e1920fd..34ebe68 100644
--- a/tools/puppet3/modules/nodejs/manifests/init.pp
+++ b/tools/puppet3/modules/nodejs/manifests/init.pp
@@ -17,8 +17,6 @@
class nodejs {
- require java
-
$custom_agent_templates = ['extensions/start-servers.sh']
class {'python_agent':
custom_templates => $custom_agent_templates,
http://git-wip-us.apache.org/repos/asf/stratos/blob/b7e16d4b/tools/puppet3/modules/php/manifests/init.pp
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/php/manifests/init.pp b/tools/puppet3/modules/php/manifests/init.pp
index 9800933..5c419a1 100755
--- a/tools/puppet3/modules/php/manifests/init.pp
+++ b/tools/puppet3/modules/php/manifests/init.pp
@@ -22,8 +22,6 @@
class php () {
- require java
-
$custom_agent_templates = ['extensions/artifacts-updated.sh']
class {'python_agent':
custom_templates => $custom_agent_templates,
http://git-wip-us.apache.org/repos/asf/stratos/blob/b7e16d4b/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 8b40c93..bd866a9 100644
--- a/tools/puppet3/modules/python_agent/templates/agent.conf.erb
+++ b/tools/puppet3/modules/python_agent/templates/agent.conf.erb
@@ -4,6 +4,8 @@ mb.port =<%= @mb_port %>
listen.address =localhost
thrift.receiver.ip =<%= @cep_ip %>
thrift.receiver.port =<%= @cep_port %>
+thrift.server.admin.username =<%= @cep_username %>
+thrift.server.admin.password =<%= @cep_password %>
param.file.path =<%= @agent_home %>/payload/launch-params
extensions.dir =<%= @agent_home %>/extensions
cep.stats.publisher.enabled =true
@@ -21,6 +23,7 @@ monitoring.server.secure.port =<%= @bam_secure_port %>
monitoring.server.admin.username =<%= @bam_username %>
monitoring.server.admin.password =<%= @bam_password %>
log.file.paths =LOG_FILE_PATHS
+APP_PATH =<%= @docroot %>
super.tenant.repository.path =/repository/deployment/server/
tenant.repository.path =/repository/tenants/
extension.instance.started =instance-started.sh
http://git-wip-us.apache.org/repos/asf/stratos/blob/b7e16d4b/tools/puppet3/modules/ruby/manifests/init.pp
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/ruby/manifests/init.pp b/tools/puppet3/modules/ruby/manifests/init.pp
index 97a1896..d1d3ef4 100644
--- a/tools/puppet3/modules/ruby/manifests/init.pp
+++ b/tools/puppet3/modules/ruby/manifests/init.pp
@@ -17,8 +17,6 @@
class ruby( $target = '/mnt' ) {
- require java
-
$custom_agent_templates = ['extensions/instance-started.sh']
class {'python_agent':
custom_templates => $custom_agent_templates,
http://git-wip-us.apache.org/repos/asf/stratos/blob/b7e16d4b/tools/puppet3/modules/wordpress/manifests/init.pp
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/wordpress/manifests/init.pp b/tools/puppet3/modules/wordpress/manifests/init.pp
index 4488961..7e3e560 100644
--- a/tools/puppet3/modules/wordpress/manifests/init.pp
+++ b/tools/puppet3/modules/wordpress/manifests/init.pp
@@ -21,8 +21,7 @@ class wordpress (
$docroot = '/var/www/html/',
$wp_password = 'wordpress'
) {
-
- require java
+
class {'python_agent':}
$packages = [
[2/3] stratos git commit: Merge remote-tracking branch
'upstream/master'
Posted by ma...@apache.org.
Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/c9d39ff4
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/c9d39ff4
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/c9d39ff4
Branch: refs/heads/master
Commit: c9d39ff49762501cf11567ce13ac771a7186a005
Parents: b7e16d4 a8146cb
Author: Chamila de Alwis <cs...@chamiladealwis.com>
Authored: Mon Nov 10 17:26:44 2014 +0530
Committer: Chamila de Alwis <cs...@chamiladealwis.com>
Committed: Mon Nov 10 17:26:44 2014 +0530
----------------------------------------------------------------------
.../applications/topic/ApplicationBuilder.java | 16 +-
.../stratos/autoscaler/monitor/Monitor.java | 14 +-
.../monitor/ParentComponentMonitor.java | 24 +-
.../monitor/application/ApplicationMonitor.java | 34 +-
.../monitor/cluster/AbstractClusterMonitor.java | 4 +-
.../autoscaler/monitor/group/GroupMonitor.java | 16 +-
.../status/checker/StatusChecker.java | 10 +-
.../termination-change.patch | 596 -------------------
.../controller/topology/TopologyBuilder.java | 43 +-
.../topology/TopologyEventPublisher.java | 6 +-
.../domain/applications/DependencyOrder.java | 10 +
.../domain/applications/ScalingOrder.java | 40 ++
12 files changed, 146 insertions(+), 667 deletions(-)
----------------------------------------------------------------------
[3/3] stratos git commit: Merge branch 'master' of
https://github.com/chamilad/stratos
Posted by ma...@apache.org.
Merge branch 'master' of https://github.com/chamilad/stratos
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/c88a5060
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/c88a5060
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/c88a5060
Branch: refs/heads/master
Commit: c88a506068baf7823f52c0be06aed74c85bb828c
Parents: b527423 c9d39ff
Author: Manula Thantriwatte <ma...@apache.org>
Authored: Mon Nov 10 16:09:22 2014 +0000
Committer: Manula Thantriwatte <ma...@apache.org>
Committed: Mon Nov 10 16:09:22 2014 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------