From a66cba613fa95db4df3882bdefe5a1cc58b72e3b Mon Sep 17 00:00:00 2001 From: "baptiste.jammet" Date: Wed, 13 Jan 2016 12:47:16 +1100 Subject: [PATCH 1/3] =?UTF-8?q?#15531=20:=20Ajout=20de=20la=20variable=20s?= =?UTF-8?q?taging=5Fpath=20(r=C3=A9cup=C3=A9r=C3=A9=20du=20module=20stagin?= =?UTF-8?q?g)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifests/init.pp | 1 + manifests/install.pp | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 62c29bb..f57c389 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,5 +1,6 @@ # See README.md class liquibase( + $staging_path = /opt/staging/, #version de liquibase $version = $liquibase::version, # Versions des drivers jdbc diff --git a/manifests/install.pp b/manifests/install.pp index 7ac8ee2..19a2a28 100644 --- 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"]], From 4e02717acab8dfa7ae565c0e32ea04689a5ee4ad Mon Sep 17 00:00:00 2001 From: "baptiste.jammet" Date: Wed, 13 Jan 2016 12:51:24 +1100 Subject: [PATCH 2/3] =?UTF-8?q?#15531=20:=20Modif=20valeur=20pas=20d=C3=A9?= =?UTF-8?q?faut=20staging=5Fpath?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifests/init.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/init.pp b/manifests/init.pp index f57c389..b89c804 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,6 +1,6 @@ # See README.md class liquibase( - $staging_path = /opt/staging/, + $staging_path = /opt/puppet/staging/, #version de liquibase $version = $liquibase::version, # Versions des drivers jdbc From 111e9d841bc317e45a7c1a223cc1c7096a8a7221 Mon Sep 17 00:00:00 2001 From: "baptiste.jammet" Date: Wed, 13 Jan 2016 12:51:24 +1100 Subject: [PATCH 3/3] =?UTF-8?q?#15531=20:=20Retrait=20valeur=20pas=20d?= =?UTF-8?q?=C3=A9faut=20staging=5Fpath?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifests/init.pp | 1 - 1 file changed, 1 deletion(-) diff --git a/manifests/init.pp b/manifests/init.pp index b89c804..62c29bb 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,6 +1,5 @@ # See README.md class liquibase( - $staging_path = /opt/puppet/staging/, #version de liquibase $version = $liquibase::version, # Versions des drivers jdbc