From 46d37e062b22b648afdc568a5011f0ed0fd4ef4f Mon Sep 17 00:00:00 2001 From: Michael LoSapio Date: Fri, 3 Feb 2017 09:49:43 -0800 Subject: [PATCH 1/2] In CentOS land - this is just xz --- manifests/cirunner.pp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/manifests/cirunner.pp b/manifests/cirunner.pp index 3bd33ba9..3eb82af8 100644 --- a/manifests/cirunner.pp +++ b/manifests/cirunner.pp @@ -34,7 +34,9 @@ $hiera_runners_key = 'gitlab_ci_runners', $manage_docker = true, $manage_repo = true, + $xz_package_name = 'xz-utils', $package_ensure = installed, + ) { validate_string($hiera_default_config_key) @@ -50,7 +52,7 @@ include ::docker # workaround for cirunner issue #1617 # https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/issues/1617 - ensure_packages('xz-utils') + ensure_packages($xz_package_name) $docker_images = { ubuntu_trusty => { From 8b65e7d5d085029cf8a63778b568a55590b6004d Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Wed, 15 Mar 2017 08:32:15 +0100 Subject: [PATCH 2/2] small code cleanup --- manifests/cirunner.pp | 1 - 1 file changed, 1 deletion(-) diff --git a/manifests/cirunner.pp b/manifests/cirunner.pp index 3eb82af8..f8e74ed7 100644 --- a/manifests/cirunner.pp +++ b/manifests/cirunner.pp @@ -36,7 +36,6 @@ $manage_repo = true, $xz_package_name = 'xz-utils', $package_ensure = installed, - ) { validate_string($hiera_default_config_key)