Pass 'package_name' as 'binary' to runner define for proper execution…

… of the runner registration
voxpupuli · Sep 27, 2017 · e1747fe · e1747fe
1 parent c7f9bd5
commit e1747fe
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/manifests/cirunner.pp b/manifests/cirunner.pp
@@ -152,6 +152,7 @@
   $runners = keys($runners_hash)
   $default_config = hiera_hash($hiera_default_config_key, {})
   gitlab::runner { $runners:
+    binary         => $package_name,
     default_config => $default_config,
     runners_hash   => $runners_hash,
     require        => Exec['gitlab-runner-restart'],

diff --git a/manifests/runner.pp b/manifests/runner.pp
@@ -21,10 +21,12 @@
 # Copyright 2015 Tobias Brunner, VSHN AG
 #
 define gitlab::runner (
+  $binary,
   $runners_hash,
   $default_config = {},
 ) {
 
+  validate_string($binary)
   validate_hash($runners_hash)
   validate_hash($default_config)
 
@@ -48,7 +50,7 @@
 
   # Execute gitlab ci multirunner register
   exec {"Register_runner_${title}":
-    command => "/usr/bin/gitlab-ci-multi-runner register -n ${parameters_string}",
+    command => "/usr/bin/${binary} register -n ${parameters_string}",
     unless  => "/bin/grep ${runner_name} ${toml_file}",
   }