Fix install URI for Zookeeper >= 3.5.5 (#129)

deric · Aug 12, 2019 · d33cf02 · d33cf02
1 parent cd631b7
commit d33cf02
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,8 @@
 - New features:
   - [Support commands whitelist](https://github.com/deric/puppet-zookeeper/issues/135) (#135)
   - [Support proxy_server for archive install method](https://github.com/deric/puppet-zookeeper/issues/133) (#133)
-
+- Fixes:
+  - Fixed mirror URI for ZooKeeper 3.5.5 from archive (832f3e5)
 - [Full diff](https://github.com/deric/puppet-zookeeper/compare/v0.8.5...v0.8.6)
 
 ## 0.8.5

diff --git a/manifests/install/archive.pp b/manifests/install/archive.pp
@@ -10,7 +10,7 @@
   if versioncmp($::zookeeper::archive_version, '3.5.5') >= 0 {
     $filename = "apache-${module_name}-${::zookeeper::archive_version}-bin"
     $archive_dl_site = $::zookeeper::archive_dl_site ? {
-      undef   => 'http://apache.org/dist',
+      undef   => 'http://apache.org/dist/zookeeper',
       default => $::zookeeper::archive_dl_site,
     }
   } else {

diff --git a/spec/classes/install_spec.rb b/spec/classes/install_spec.rb
@@ -382,7 +382,7 @@
     let(:install_dir) { '/opt' }
     let(:zoo_dir) { '/opt/zookeeper' }
     let(:vers) { '3.5.5' }
-    let(:mirror_url) { 'http://apache.org/dist' }
+    let(:mirror_url) { 'http://apache.org/dist/zookeeper' }
     let(:basefilename) { "apache-zookeeper-#{vers}-bin.tar.gz" }
     let(:package_url) { "#{mirror_url}/zookeeper-#{vers}/apache-zookeeper-#{vers}-bin.tar.gz" }
     let(:extract_path) { "/opt/apache-zookeeper-#{vers}-bin" }