From d7af89543316f4d592b7728949168d6b5ecbd917 Mon Sep 17 00:00:00 2001
From: Tom Barber <tom@analytical-labs.com>
Date: Thu, 7 Jun 2012 18:08:33 +0100
Subject: [PATCH] try and force order

---
 manifests/instance.pp | 25 +------------------------
 metadata.json         |  2 +-
 2 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/manifests/instance.pp b/manifests/instance.pp
index 6e219b0..6f91ec9 100644
--- a/manifests/instance.pp
+++ b/manifests/instance.pp
@@ -21,30 +21,7 @@
 define saiku::instance ($ensure,
 	$app_name = 'saiku',
 	$default_datasource = true) {
-	file {
-		'/opt/apache-tomcat/lib/mysql-connector-java-5.1.17.jar' :
-			ensure => present,
-			owner => "tomcat",
-			group => "tomcat",
-			source => "puppet:///modules/saiku/mysql-connector-java-5.1.17.jar",
-			mode => 755,
-	} ->
-	file {
-		'/opt/apache-tomcat/lib/iijdbc.jar' :
-			ensure => present,
-			owner => "tomcat",
-			group => "tomcat",
-			source => "puppet:///modules/saiku/iijdbc.jar",
-			mode => 755,
-	} ->
-	file {
-		'/opt/apache-tomcat/lib/postgresql-9.1-901.jdbc4.jar' :
-			ensure => present,
-			owner => "tomcat",
-			group => "tomcat",
-			source => "puppet:///modules/saiku/postgresql-9.1-901.jdbc4.jar",
-			mode => 755,
-	} ->
+	
 	package {
 		"${app_name}" :
 			ensure => latest,
diff --git a/metadata.json b/metadata.json
index 8340109..18ad32e 100644
--- a/metadata.json
+++ b/metadata.json
@@ -19,7 +19,7 @@
     "manifests/apt.pp": "9f7083a12f3bb561103aff886113c399",
     "manifests/datasource.pp": "d66021ccf746140b08fdf439070ec348",
     "manifests/init.pp": "5b58bc2d33888f897b6a86f62b8de992",
-    "manifests/instance.pp": "fc526c4beccae778dd330fb137859146",
+    "manifests/instance.pp": "5be224006d17974fbcfed1371d600620",
     "manifests/tomcat.pp": "4c333b2caab86e78d0f13559008d1cfc",
     "spec/spec.opts": "a600ded995d948e393fbe2320ba8e51c",
     "spec/spec_helper.rb": "ca19ec4f451ebc7fdb035b52eae6e909",