Separate backinator binary from consul path

Signed-off-by: JoshVanL <vleeuwenjoshua@gmail.com>

Author: JoshVanL

puppet/modules/consul/manifests/init.pp

@@ -76,11 +76,12 @@
   Exec { path => $path }
 
   $_dest_dir = "${dest_dir}/${app_name}-${version}"
+  $_backinator_dest_dir = "${dest_dir}/${app_name}-backinator-${backinator_version}"
   $bin_path = "${_dest_dir}/${app_name}"
   $link_path = "${dest_dir}/bin"
   $config_path = "${config_dir}/consul.json"
 
-  $exporter_dest_dir = "${dest_dir}/${app_name}_exporter-${exporter_version}"
+  $exporter_dest_dir = "${dest_dir}/${app_name}-exporter-${exporter_version}"
   $exporter_bin_path = "${exporter_dest_dir}/${app_name}_exporter"
 
   $_consul_master_token = $consul_master_token ? {

puppet/modules/consul/manifests/install.pp

@@ -91,6 +91,14 @@
       extract_path      => $consul::exporter_dest_dir,
       extract_command   => 'tar xfz %s --strip-components=1'
     }
+    -> file {$consul::exporter_bin_path:
+      ensure => file,
+      mode   => '0755',
+    }
+    -> file {"${consul::link_path}/${consul::app_name}_exporter":
+      ensure => link,
+      target => $consul::exporter_bin_path,
+    }
   }
   else {
     file {$consul::exporter_dest_dir:
@@ -99,22 +107,26 @@
   }
 
 
-  archive {"${consul::_dest_dir}/consul-backinator":
+  file {$consul::_backinator_dest_dir:
+    ensure => directory,
+    mode   => '0755',
+  }
+  -> archive {"${consul::_dest_dir}/consul-backinator":
     ensure        => present,
     extract       => false,
     source        => $backinator_download_url,
     checksum      => $consul::backinator_sha256,
     checksum_type => 'sha256',
     cleanup       => false,
-    creates       => "${consul::_dest_dir}/consul-backinator",
+    creates       => "${consul::_backinator_dest_dir}/consul-backinator",
   }
-  -> file {"${consul::_dest_dir}/consul-backinator":
+  -> file {"${consul::_backinator_dest_dir}/consul-backinator":
     ensure => file,
     mode   => '0755',
   }
   -> file {"${consul::link_path}/${consul::app_name}-backinator":
     ensure => link,
-    target => "${consul::_dest_dir}/consul-backinator",
+    target => "${consul::_backinator_dest_dir}/consul-backinator",
   }
 
   file { "${consul::_dest_dir}/consul-backup.sh":

puppet/modules/consul/spec/classes/install_spec.rb

@@ -28,9 +28,17 @@
     end
 
     it 'should install consul exporter' do
-      should contain_file('/opt/consul_exporter-0.3.0').with(
+      should contain_file('/opt/consul-exporter-0.3.0').with(
         :ensure => 'directory',
       )
+      should contain_file('/opt/consul-exporter-0.3.0/consul_exporter').with(
+        :ensure => 'file',
+        :mode => '0755',
+      )
+      should contain_file('/opt/bin/consul_exporter').with(
+        :ensure => 'link',
+        :target => '/opt/consul-exporter-0.3.0/consul_exporter',
+      )
     end
 
     it 'should install consul backup script' do
@@ -45,13 +53,16 @@
     end
 
     it 'should install consul backinator' do
-      should contain_file('/opt/consul-1.2.1/consul-backinator').with(
+      should contain_file('/opt/consul-backinator-1.3').with(
+        :ensure => 'directory',
+      )
+      should contain_file('/opt/consul-backinator-1.3/consul-backinator').with(
         :ensure => 'file',
         :mode => '0755',
       )
       should contain_file('/opt/bin/consul-backinator').with(
         :ensure => 'link',
-        :target => '/opt/consul-1.2.1/consul-backinator',
+        :target => '/opt/consul-backinator-1.3/consul-backinator',
       )
     end
   end