Merge pull request #184 from dhollinger/master

#[puppethack] MODULES-4003 Fix ordering issue when using a package for installation
puppetlabs · Dec 13, 2016 · 1d84d3a · 1d84d3a
2 parents 58781ea + 717ecf2
commit 1d84d3a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,4 @@ coverage/
 log/
 .idea/
 *.iml
+.ruby-version
diff --git a/manifests/instance.pp b/manifests/instance.pp
@@ -70,17 +70,6 @@
   }
 
   if $_install_from_source != undef {
-    # XXX This file resource is for backwards compatibility. Previously the base
-    # class created this directory for source installs, even though it may never
-    # be used. Users may have created source installs under this directory, so
-    # it must exist. tomcat::install::source will take care of creating base.
-    if $_catalina_base != $_catalina_home and $_manage_base {
-      ensure_resource('file',$_catalina_home, {
-        ensure => directory,
-        owner  => $_user,
-        group  => $_group,
-      })
-    }
     # XXX This is for backwards compatibility. Declare a tomcat install, but install
     # the software into the base instead of the home.
     tomcat::install { $name: