Repository: incubator-stratos Updated Branches: refs/heads/master 8a41868d3 -> 9e2df6d3c
Fixed dependency cycle issue with Tomcat Puppet Modules Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/9e2df6d3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/9e2df6d3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/9e2df6d3 Branch: refs/heads/master Commit: 9e2df6d3c7538f42b075be745b66fa4ee4469631 Parents: 8a41868 Author: M. Isuru Tharanga Chrishantha Perera <[email protected]> Authored: Sun Apr 6 15:23:02 2014 +0530 Committer: M. Isuru Tharanga Chrishantha Perera <[email protected]> Committed: Sun Apr 6 15:23:02 2014 +0530 ---------------------------------------------------------------------- tools/puppet3/manifests/nodes.pp | 2 +- tools/puppet3/modules/tomcat/manifests/init.pp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9e2df6d3/tools/puppet3/manifests/nodes.pp ---------------------------------------------------------------------- diff --git a/tools/puppet3/manifests/nodes.pp b/tools/puppet3/manifests/nodes.pp index cf7cf73..2229830 100644 --- a/tools/puppet3/manifests/nodes.pp +++ b/tools/puppet3/manifests/nodes.pp @@ -72,7 +72,7 @@ node /tomcat/ inherits base { class {'tomcat':} #install tomcat befor agent - Class['tomcat'] ~> Class['agent'] + #Class['tomcat'] ~> Class['agent'] } # mysql cartridge node http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9e2df6d3/tools/puppet3/modules/tomcat/manifests/init.pp ---------------------------------------------------------------------- diff --git a/tools/puppet3/modules/tomcat/manifests/init.pp b/tools/puppet3/modules/tomcat/manifests/init.pp index 55df4e3..45f92b3 100644 --- a/tools/puppet3/modules/tomcat/manifests/init.pp +++ b/tools/puppet3/modules/tomcat/manifests/init.pp @@ -28,8 +28,8 @@ class tomcat( tag($service_code) file { - "${target}/packs": - ensure => directory; +# "${target}/packs": +# ensure => directory; "${tomcat_home}/conf/server.xml": ensure => present,
