diff options
| author | Rafael Chicoli <rafaelchicoli@hotmail.com> | 2016-01-28 20:05:47 +0100 |
|---|---|---|
| committer | Rafael Chicoli <rafaelchicoli@hotmail.com> | 2016-01-28 21:48:10 +0100 |
| commit | f025aeebe56924ac3393c79c4cfacd0389f14b36 (patch) | |
| tree | 74a29bee13233ccdd8f377fc70fea275cf481655 | |
| parent | 3f61ba8a16d4ef1db6478a5600dc404e637d3a59 (diff) | |
add tls_ca_file parameter
| -rw-r--r-- | manifests/runner.pp | 1 | ||||
| -rw-r--r-- | templates/fragment_runner_config.toml.erb | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/manifests/runner.pp b/manifests/runner.pp index 3877a0c..5e204d8 100644 --- a/manifests/runner.pp +++ b/manifests/runner.pp @@ -63,6 +63,7 @@ define gitlab_ci_multi_runner::runner ( $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}": diff --git a/templates/fragment_runner_config.toml.erb b/templates/fragment_runner_config.toml.erb index 6735c6a..092e37d 100644 --- a/templates/fragment_runner_config.toml.erb +++ b/templates/fragment_runner_config.toml.erb @@ -1,6 +1,8 @@ [[runners]] +<% if @name -%> name = "<%= @name %>" +<% end -%> executor = "<%= @executor %>" <% if @url -%> url = "<%= @url %>" @@ -29,6 +31,9 @@ <% if @tls_skip_verify -%> tls_skip_verify = <%= @tls_skip_verify %> <% end -%> +<% if @tls_ca_file -%> + tls_ca_file = "<%= @tls_ca_file %>" +<% end -%> <% if executor == 'docker' -%> [runners.docker] <%- if @docker_params['host'] -%> |