You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2014/11/09 07:21:01 UTC
stratos git commit: changes to python_agent puppet files
Repository: stratos
Updated Branches:
refs/heads/docker-grouping-merge 409594d74 -> b9a289453
changes to python_agent puppet files
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/b9a28945
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/b9a28945
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/b9a28945
Branch: refs/heads/docker-grouping-merge
Commit: b9a289453671a6e13cfc06a126a93c630758d33b
Parents: 409594d
Author: lasinducharith <la...@gmail.com>
Authored: Sun Nov 9 11:50:28 2014 +0530
Committer: lasinducharith <la...@gmail.com>
Committed: Sun Nov 9 11:50:28 2014 +0530
----------------------------------------------------------------------
.../modules/python_agent/manifests/init.pp | 55 ++++++++++++--------
.../python_agent/manifests/push_templates.pp | 4 +-
2 files changed, 35 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/b9a28945/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 d8a5d65..bd3ae90 100644
--- a/tools/puppet3/modules/python_agent/manifests/init.pp
+++ b/tools/puppet3/modules/python_agent/manifests/init.pp
@@ -16,7 +16,7 @@
# under the License.
class python_agent(
- $version = '4.1.0',
+ $version = '4.1.0-SNAPSHOT',
$owner = 'root',
$group = 'root',
$target = "/mnt",
@@ -33,8 +33,8 @@ class python_agent(
$agent_name = "apache-stratos-python-${service_code}-${version}"
$agent_home= "${target}/${agent_name}"
- $split_mburl = split($mb_url, "//")
- $split_mburl = split($split_mburl[1], ":")
+ $split_mburls = split($mb_url, "//")
+ $split_mburl = split($split_mburls[1], ":")
$mb_ip = $split_mburl[0]
$mb_port = $split_mburl[1]
@@ -55,14 +55,12 @@ class python_agent(
'extensions/mount-volumes.sh',
'extensions/subscription-domain-added.sh',
'extensions/subscription-domain-removed.sh',
- 'agent.conf',
- 'logging.ini',
]
- agent::initialize { $service_code:
+ python_agent::initialize { $service_code:
repo => $package_repo,
- version => $carbon_version,
- service => $agent_name,
+ version => $version,
+ agent_name => $agent_name,
local_dir => $local_package_dir,
target => $target,
owner => $owner,
@@ -71,13 +69,13 @@ class python_agent(
exec { 'copy launch-params to agent_home':
path => '/bin/',
command => "mkdir -p ${agent_home}/payload; cp /tmp/payload/launch-params ${agent_home}/payload/launch-params",
- require => Agent::Initialize[$service_code];
+ require => Python_agent::Initialize[$service_code];
}
exec { 'make extension folder':
path => '/bin/',
command => "mkdir -p ${target}/${service_code}/extensions",
- require => Agent::Initialize[$service_code];
+ require => Python_agent::Initialize[$service_code];
}
@@ -91,43 +89,56 @@ class python_agent(
}
# applying default extensions
- agent::push_templates {
+ python_agent::push_templates {
$service_templates:
target => $agent_home,
template_dir => "agent",
- require => Agent::Initialize[$service_code];
+ require => Python_agent::Initialize[$service_code];
}
# applying custom extensions
unless $module == 'undef' {
- agent::push_templates {
+ python_agent::push_templates {
$custom_templates:
- target => $carbon_home,
+ target => $agent_home,
template_dir => "${module}/agent",
- require => [Agent::Initialize[$service_code]]
+ require => [Python_agent::Initialize[$service_code]]
}
}
# removing default extensions which are shipped by agent.zip
- agent::remove_templates {
+ python_agent::remove_templates {
$exclude_templates:
- target => $carbon_home,
+ target => $agent_home,
}
$required_resources = $module ? {
'undef' => [
Exec['copy launch-params to agent_home'],
- Agent::Push_templates[$default_templates_excluded],
+ Python_agent::Push_templates[$default_templates_excluded],
],
default =>[
Exec['copy launch-params to agent_home'],
- Agent::Push_templates[$default_templates_excluded],
- Agent::Push_templates[$custom_templates] ]
+ Python_agent::Push_templates[$default_templates_excluded],
+ Python_agent::Push_templates[$custom_templates] ]
+ }
+
+ file { "${agent_home}/agent.conf":
+ ensure => file,
+ content => template("python_agent/agent.conf.erb"),
+ require => Python_agent::Initialize[$service_code],
}
- agent::start { $service_code:
+ file { "${agent_home}/logging.ini":
+ ensure => file,
+ content => template("python_agent/logging.ini.erb"),
+ require => File["${agent_home}/agent.conf"],
+ }
+
+ python_agent::start { $service_code:
owner => $owner,
target => $agent_home,
require => $required_resources
}
-}
\ No newline at end of file
+}
+
http://git-wip-us.apache.org/repos/asf/stratos/blob/b9a28945/tools/puppet3/modules/python_agent/manifests/push_templates.pp
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/python_agent/manifests/push_templates.pp b/tools/puppet3/modules/python_agent/manifests/push_templates.pp
index 515c30b..1a05b16 100755
--- a/tools/puppet3/modules/python_agent/manifests/push_templates.pp
+++ b/tools/puppet3/modules/python_agent/manifests/push_templates.pp
@@ -17,7 +17,7 @@
# Apply the templates
-define agent::push_templates ($target,$template_dir) {
+define python_agent::push_templates ($target,$template_dir) {
file { "${target}/${name}":
ensure => present,
owner => $agent::owner,
@@ -25,4 +25,4 @@ define agent::push_templates ($target,$template_dir) {
mode => '0755',
content => template("${template_dir}/${name}.erb"),
}
-}
\ No newline at end of file
+}