Merge pull request #4 from baptistejammet/master

#15531 : Ajout de la variable staging_path (récupéré du module staging)
DSI-Ville-Noumea · Jan 13, 2016 · c12264d · c12264d
2 parents 81a673e + 111e9d8
commit c12264d
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/manifests/install.pp b/manifests/install.pp
@@ -94,7 +94,7 @@
   }
 
   exec { "copy_postgresql-${postgresql_version}.jar":
-    command => "/bin/cp /opt/puppet/staging/liquibase/postgresql-${postgresql_version}.jar /opt/apps/liquibase/liquibase-${version}/lib/",
+    command => "/bin/cp ${::staging::path}/liquibase/postgresql-${postgresql_version}.jar /opt/apps/liquibase/liquibase-${version}/lib/",
     path    => '/usr/local/bin/:/bin/',
     creates => "/opt/liquibase-${version}/lib/postgresql-${postgresql_version}.jar",
     require => [Staging::Extract["liquibase-${version}-bin.tar.gz"], Staging::File["postgresql-${postgresql_version}.jar"]]
@@ -108,7 +108,7 @@
   }
 
   exec { "copy_derbyclient-${derby_version}.jar":
-    command => "/bin/cp /opt/puppet/staging/liquibase/derbyclient-${derby_version}.jar /opt/apps/liquibase/liquibase-${version}/lib/",
+    command => "/bin/cp ${::staging::path}/liquibase/derbyclient-${derby_version}.jar /opt/apps/liquibase/liquibase-${version}/lib/",
     path    => '/usr/local/bin/:/bin/',
     creates => "/opt/apps/liquibase/liquibase-${version}/lib/derbyclient-${derby_version}.jar",
     require => [Staging::Extract["liquibase-${version}-bin.tar.gz"], Staging::File["derbyclient-${derby_version}.jar"]],
@@ -122,7 +122,7 @@
   }
 
   exec { "copy_h2-${h2_version}.jar":
-    command => "/bin/cp /opt/puppet/staging/liquibase/h2-${h2_version}.jar /opt/apps/liquibase/liquibase-${version}/lib/",
+    command => "/bin/cp ${::staging::path}/liquibase/h2-${h2_version}.jar /opt/apps/liquibase/liquibase-${version}/lib/",
     path    => '/usr/local/bin/:/bin/',
     creates => "/opt/apps/liquibase/liquibase-${version}/lib/h2-${h2_version}.jar",
     require => [Staging::Extract["liquibase-${version}-bin.tar.gz"], Staging::File["h2-${h2_version}.jar"]],
@@ -136,7 +136,7 @@
   }
 
   exec { "copy_hsqldb-${hsqldb_version}.jar":
-    command => "/bin/cp /opt/puppet/staging/liquibase/hsqldb-${hsqldb_version}.jar /opt/apps/liquibase/liquibase-${version}/lib/",
+    command => "/bin/cp ${::staging::path}/liquibase/hsqldb-${hsqldb_version}.jar /opt/apps/liquibase/liquibase-${version}/lib/",
     path    => '/usr/local/bin/:/bin/',
     creates => "/opt/apps/liquibase/liquibase-${version}/lib/hsqldb-${hsqldb_version}.jar",
     require => [Staging::Extract["liquibase-${version}-bin.tar.gz"], Staging::File["hsqldb-${hsqldb_version}.jar"]],
@@ -150,7 +150,7 @@
   }
 
   exec { "copy_jtds-${jtds_version}.jar":
-    command => "/bin/cp /opt/puppet/staging/liquibase/jtds-${jtds_version}.jar /opt/apps/liquibase/liquibase-${version}/lib/",
+    command => "/bin/cp ${::staging::path}/liquibase/jtds-${jtds_version}.jar /opt/apps/liquibase/liquibase-${version}/lib/",
     path    => '/usr/local/bin/:/bin/',
     creates => "/opt/apps/liquibase/liquibase-${version}/lib/jtds-${jtds_version}.jar",
     require => [Staging::Extract["liquibase-${version}-bin.tar.gz"], Staging::File["jtds-${jtds_version}.jar"]],
@@ -164,7 +164,7 @@
   }
 
   exec { "copy_mysql-connector-java-${mysql_version}.jar":
-    command => "/bin/cp /opt/puppet/staging/liquibase/mysql-connector-java-${mysql_version}.jar /opt/apps/liquibase/liquibase-${version}/lib/",
+    command => "/bin/cp ${::staging::path}/liquibase/mysql-connector-java-${mysql_version}.jar /opt/apps/liquibase/liquibase-${version}/lib/",
     path    => '/usr/local/bin/:/bin/',
     creates => "/opt/apps/liquibase/liquibase-${version}/lib/mysql-connector-java-${mysql_version}.jar",
     require => [Staging::Extract["liquibase-${version}-bin.tar.gz"], Staging::File["mysql-connector-java-${mysql_version}.jar"]],
@@ -178,7 +178,7 @@
   }
 
   exec { "copy_jt400-${jt400_version}.jar":
-    command => "/bin/cp /opt/puppet/staging/liquibase/jt400-${jt400_version}.jar /opt/apps/liquibase/liquibase-${version}/lib/",
+    command => "/bin/cp ${::staging::path}/liquibase/jt400-${jt400_version}.jar /opt/apps/liquibase/liquibase-${version}/lib/",
     path    => '/usr/local/bin/:/bin/',
     creates => "/opt/apps/liquibase/liquibase-${version}/lib/jt400-${jt400_version}.jar",
     require => [Staging::Extract["liquibase-${version}-bin.tar.gz"], Staging::File["jt400-${jt400_version}.jar"]],