Merge pull request voxpupuli#53 from dhoppe/install_dir

Fix parameter install_dir/install_directory. This closes voxpupuli#52
elmendalerenda · Mar 15, 2016 · 707fbe4 · 707fbe4
2 parents 0562352 + 189466e
commit 707fbe4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/manifests/consumer.pp b/manifests/consumer.pp
@@ -47,7 +47,7 @@
 class kafka::consumer (
   $version          = $kafka::params::version,
   $scala_version    = $kafka::params::scala_version,
-  $install_dir      = '',
+  $install_dir      = $kafka::params::install_dir,
   $mirror_url       = $kafka::params::mirror_url,
   $config           = {},
   $config_defaults  = $kafka::params::consumer_config_defaults,

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -37,7 +37,7 @@
 class kafka (
   $version       = $kafka::params::version,
   $scala_version = $kafka::params::scala_version,
-  $install_dir   = '',
+  $install_dir   = $kafka::params::install_dir,
   $mirror_url    = $kafka::params::mirror_url,
   $install_java  = $kafka::params::install_java,
   $package_dir   = $kafka::params::package_dir
@@ -51,7 +51,9 @@
   $basefilename = "kafka_${scala_version}-${version}.tgz"
   $package_url = "${mirror_url}/kafka/${version}/${basefilename}"
 
-  if $install_dir == '' {
+  if $version != $kafka::params::version {
+    $install_directory = "/opt/kafka-${scala_version}-${version}"
+  } elsif $scala_version != $kafka::params::scala_version {
     $install_directory = "/opt/kafka-${scala_version}-${version}"
   } else {
     $install_directory = $install_dir

diff --git a/manifests/mirror.pp b/manifests/mirror.pp
@@ -60,7 +60,7 @@
 class kafka::mirror (
   $version                  = $kafka::params::version,
   $scala_version            = $kafka::params::scala_version,
-  $install_dir              = '',
+  $install_dir              = $kafka::params::install_dir,
   $mirror_url               = $kafka::params::mirror_url,
   $consumer_config          = {},
   $consumer_config_defaults = $kafka::params::consumer_config_defaults,

diff --git a/manifests/producer.pp b/manifests/producer.pp
@@ -48,7 +48,7 @@
 class kafka::producer (
   $version          = $kafka::params::version,
   $scala_version    = $kafka::params::scala_version,
-  $install_dir      = '',
+  $install_dir      = $kafka::params::install_dir,
   $mirror_url       = $kafka::params::mirror_url,
   $config           = {},
   $config_defaults  = $kafka::params::producer_config_defaults,