diff --git a/puppet/modules/kubernetes/README.md b/puppet/modules/kubernetes/README.md index 30b1423611..42788eb7bd 100644 --- a/puppet/modules/kubernetes/README.md +++ b/puppet/modules/kubernetes/README.md @@ -33,6 +33,11 @@ Class: kubernetes * Type: `Any` * Default: `$::kubernetes::params::download_dir` +##### `download_url` + +* Type: `Any` +* Default: `$::kubernetes::params::download_url` + ##### `dest_dir` * Type: `Any` diff --git a/puppet/modules/kubernetes/manifests/init.pp b/puppet/modules/kubernetes/manifests/init.pp index 7f53571eae..486f8e684a 100644 --- a/puppet/modules/kubernetes/manifests/init.pp +++ b/puppet/modules/kubernetes/manifests/init.pp @@ -3,6 +3,7 @@ $version = $::kubernetes::params::version, $bin_dir = $::kubernetes::params::bin_dir, $download_dir = $::kubernetes::params::download_dir, + $download_url = $::kubernetes::params::download_url, $dest_dir = $::kubernetes::params::dest_dir, $config_dir = $::kubernetes::params::config_dir, $systemd_dir = $::kubernetes::params::systemd_dir, @@ -96,8 +97,8 @@ $_master_url = $master_url } - $download_url = regsubst( - $::kubernetes::params::download_url, + $real_download_url = regsubst( + $download_url, '#VERSION#', $version, 'G' diff --git a/puppet/modules/kubernetes/manifests/install.pp b/puppet/modules/kubernetes/manifests/install.pp index 2b845a6a92..8952effacb 100644 --- a/puppet/modules/kubernetes/manifests/install.pp +++ b/puppet/modules/kubernetes/manifests/install.pp @@ -9,7 +9,7 @@ mode => '0755', } -> exec {"kubernetes-${kubernetes::version}-download": - command => "curl -sL -o ${hyperkube_path} ${::kubernetes::download_url}", + command => "curl -sL -o ${hyperkube_path} ${::kubernetes::real_download_url}", creates => $hyperkube_path, path => ['/usr/bin/', '/bin'], } diff --git a/puppet/modules/vault_client/README.md b/puppet/modules/vault_client/README.md index 14e0afa51e..b004d1f516 100644 --- a/puppet/modules/vault_client/README.md +++ b/puppet/modules/vault_client/README.md @@ -38,6 +38,10 @@ Puppet module to install and manage a vault client install [*init_role*] TODO +[*download_url*] + Download url for the `vault-helper` binary. It supports the placeholder `#VERSION#` + that gets replaced by `$version` variable. + #### Parameters ##### `version` @@ -55,6 +59,11 @@ Puppet module to install and manage a vault client install * Type: `Any` * Default: `$::vault_client::params::download_dir` +##### `download_url` + +* Type: `Any` +* Default: `$::vault_client::params::download_url` + ##### `dest_dir` * Type: `Any` diff --git a/puppet/modules/vault_client/manifests/init.pp b/puppet/modules/vault_client/manifests/init.pp index a4f80545b5..a18e27d210 100644 --- a/puppet/modules/vault_client/manifests/init.pp +++ b/puppet/modules/vault_client/manifests/init.pp @@ -25,6 +25,7 @@ $version = $::vault_client::params::version, $bin_dir = $::vault_client::params::bin_dir, $download_dir = $::vault_client::params::download_dir, + $download_url = $::vault_client::params::download_url, $dest_dir = $::vault_client::params::dest_dir, $server_url = $::vault_client::params::server_url, $systemd_dir = $::vault_client::params::systemd_dir, @@ -51,8 +52,8 @@ } ## build download URL - $download_url = regsubst( - $::vault_client::params::download_url, + $real_download_url = regsubst( + $download_url, '#VERSION#', $version, 'G' diff --git a/puppet/modules/vault_client/manifests/install.pp b/puppet/modules/vault_client/manifests/install.pp index 721855b925..b85503bd96 100644 --- a/puppet/modules/vault_client/manifests/install.pp +++ b/puppet/modules/vault_client/manifests/install.pp @@ -11,7 +11,7 @@ mode => '0755', } -> exec {"vault-helper-${vault_client::version}-download": - command => "curl -sL ${::vault_client::download_url} -o ${vault_helper_path}/vault-helper", + command => "curl -sL ${::vault_client::real_download_url} -o ${vault_helper_path}/vault-helper", creates => "${vault_helper_path}/vault-helper", path => ['/usr/bin', '/bin'], }