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 2015/03/06 09:15:28 UTC
stratos git commit: Fixing STRATOS-1230,
artifact update event can come before puppet install git in cartridge
Repository: stratos
Updated Branches:
refs/heads/master 37a1529ca -> f778e0f5f
Fixing STRATOS-1230, artifact update event can come before puppet install git in cartridge
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/f778e0f5
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/f778e0f5
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/f778e0f5
Branch: refs/heads/master
Commit: f778e0f5f8361866b657eee66f920b50b6614059
Parents: 37a1529
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Fri Mar 6 12:37:35 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Fri Mar 6 12:37:35 2015 +0530
----------------------------------------------------------------------
tools/puppet3/modules/php/manifests/init.pp | 3 +--
tools/puppet3/modules/stratos_base/manifests/init.pp | 3 ++-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/f778e0f5/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 caf38f6..e088fdd 100755
--- a/tools/puppet3/modules/php/manifests/init.pp
+++ b/tools/puppet3/modules/php/manifests/init.pp
@@ -54,7 +54,6 @@ class php () {
'mcrypt',
'ufw',
'fail2ban',
- 'git',
'libboost-all-dev',
'ruby']
@@ -132,5 +131,5 @@ class php () {
}
#install stratos_base before java before php before agent
- Class['stratos_base'] -> Class['python_agent'] -> Class['php']
+ Class['stratos_base'] -> Class['php'] -> Class['python_agent']
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/f778e0f5/tools/puppet3/modules/stratos_base/manifests/init.pp
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/stratos_base/manifests/init.pp b/tools/puppet3/modules/stratos_base/manifests/init.pp
index 6e17570..2feead7 100755
--- a/tools/puppet3/modules/stratos_base/manifests/init.pp
+++ b/tools/puppet3/modules/stratos_base/manifests/init.pp
@@ -53,7 +53,8 @@ class stratos_base(
'wget',
'zip',
'unzip',
- 'tar']
+ 'tar',
+ 'git']
package { $packages:
ensure => $package_ensure,