diff options
| author | Jeoffrey B <jeoffrey54@gmail.com> | 2016-02-03 08:22:30 +0100 |
|---|---|---|
| committer | Jeoffrey B <jeoffrey54@gmail.com> | 2016-02-03 08:22:30 +0100 |
| commit | 210f770853bb2c7c5ddca7eb52f85db7c2377ab2 (patch) | |
| tree | efe31ee1a68caa7ff3999297b363956502b644b0 /manifests | |
| parent | 2e566505836f0ac7aa77b6fd4d7f8f1a789e77b9 (diff) | |
| parent | 2bc9d47add521d78f8ade7ff5de36b77104d0371 (diff) | |
Merge pull request #2 from rchicoli/add-runner-parameters
Add runner parameters
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/config.pp | 3 | ||||
| -rw-r--r-- | manifests/init.pp | 6 | ||||
| -rw-r--r-- | manifests/params.pp | 2 | ||||
| -rw-r--r-- | manifests/runner.pp | 3 |
4 files changed, 9 insertions, 5 deletions
diff --git a/manifests/config.pp b/manifests/config.pp index c8a6fbd..fec0ac2 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -21,7 +21,4 @@ class gitlab_ci_multi_runner::config ( order => '01', } - if $gitlab_ci_multi_runner::runners { - create_resources(gitlab_ci_multi_runner::runner, $runners) - } } diff --git a/manifests/init.pp b/manifests/init.pp index 1670d98..cd39308 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -45,7 +45,11 @@ class gitlab_ci_multi_runner ( $config_file = $gitlab_ci_multi_runner::params::config_file, ) inherits gitlab_ci_multi_runner::params { - # validate parameters here + validate_hash($gitlab_ci_multi_runner::runners) + + if $gitlab_ci_multi_runner::runners { + create_resources(gitlab_ci_multi_runner::runner, $runners) + } anchor { 'before_gitlab_ci_multi_runner': } -> class { 'gitlab_ci_multi_runner::install': } -> diff --git a/manifests/params.pp b/manifests/params.pp index d883d12..5a18d34 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -10,7 +10,7 @@ class gitlab_ci_multi_runner::params { $group = 'gitlab-runner' $concurrent = 1 - $runners = undef + $runners = {} $service_ensure = true $service_start = '/usr/bin/gitlab-ci-multi-runner start' diff --git a/manifests/runner.pp b/manifests/runner.pp index 2af8271..1ec3e82 100644 --- a/manifests/runner.pp +++ b/manifests/runner.pp @@ -60,8 +60,11 @@ define gitlab_ci_multi_runner::runner ( $disable_verbose = undef, $output_limit = undef, $docker_params = undef, + $ssh_params = undef, $parallels_params = undef, $config_file = $gitlab_ci_multi_runner::params::config_file, + $tls_skip_verify = undef, + $tls_ca_file = undef, ){ concat::fragment { "${name}_${gitlab_ci_multi_runner::config_file}": |