Repository: stratos Updated Branches: refs/heads/master a4710cbfb -> 275bf9216
Fix puppet module for python agent package change Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/275bf921 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/275bf921 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/275bf921 Branch: refs/heads/master Commit: 275bf9216e9559d4e97a5165197f55e3f0795b32 Parents: a4710cb Author: Lahiru Sandaruwan <[email protected]> Authored: Wed May 27 12:15:17 2015 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Wed May 27 12:15:26 2015 +0530 ---------------------------------------------------------------------- tools/puppet3/modules/python_agent/files/README.txt | 4 ++-- tools/puppet3/modules/python_agent/manifests/initialize.pp | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/275bf921/tools/puppet3/modules/python_agent/files/README.txt ---------------------------------------------------------------------- diff --git a/tools/puppet3/modules/python_agent/files/README.txt b/tools/puppet3/modules/python_agent/files/README.txt index 6fef5cb..3c105a6 100644 --- a/tools/puppet3/modules/python_agent/files/README.txt +++ b/tools/puppet3/modules/python_agent/files/README.txt @@ -1,12 +1,12 @@ This folder should have following: -1. apache-stratos-cartridge-agent-${version}.zip file +1. apache-stratos-python-cartridge-agent-${version}.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.zip +>activemq apache-stratos-python-cartridge-agent-4.0.0.zip 3. Under $mb_type folder, please add all the client jars, that should be copied to the agent's lib directory. http://git-wip-us.apache.org/repos/asf/stratos/blob/275bf921/tools/puppet3/modules/python_agent/manifests/initialize.pp ---------------------------------------------------------------------- diff --git a/tools/puppet3/modules/python_agent/manifests/initialize.pp b/tools/puppet3/modules/python_agent/manifests/initialize.pp index c21a502..452a9ac 100755 --- a/tools/puppet3/modules/python_agent/manifests/initialize.pp +++ b/tools/puppet3/modules/python_agent/manifests/initialize.pp @@ -61,7 +61,7 @@ define python_agent::initialize ($repo, $version, $agent_name, $local_dir, $targ exec { "creating_target_for_python_${name}": path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', - command => "mkdir -p ${target}/${agent_name}", + command => "mkdir -p ${target}", require => Exec["pip installs-pexpect"]; "creating_local_package_repo_for_python_${name}": @@ -82,7 +82,6 @@ define python_agent::initialize ($repo, $version, $agent_name, $local_dir, $targ "extracting_${agent_name}.zip_for_${name}": path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', cwd => "$target/${agent_name}", - #/mnt/apache-stratos-python-cartridge-agent-1.0.0/agent.py unless => "test -d ${target}/${agent_name}/agent.conf", command => "unzip -o ${local_dir}/${agent_name}.zip", logoutput => 'on_failure', @@ -91,8 +90,8 @@ define python_agent::initialize ($repo, $version, $agent_name, $local_dir, $targ "setting_permission_for_python_${name}": path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', cwd => $target, - command => "chown -R ${owner}:${owner} ${target}/${agent_name} ; - chmod -R 755 ${target}/${agent_name}", + command => "chown -R ${owner}:${owner} ${target} ; + chmod -R 755 ${target}", logoutput => 'on_failure', require => Exec["extracting_${agent_name}.zip_for_${name}"]; }
