1
0
mirror of https://github.com/krislamo/puppet-fluentd synced 2024-12-16 13:20:35 +00:00

Allow configuring the major version of the repository.

This commit is contained in:
Ricky Ramirez 2018-05-04 13:07:16 -07:00
parent 540ef4e40d
commit 19820e5e2a
4 changed files with 8 additions and 2 deletions

View File

@ -8,6 +8,9 @@
# [*repo_manage*] # [*repo_manage*]
# Include repository to install recent fluentd (td-agent) from # Include repository to install recent fluentd (td-agent) from
# Default: 'true' # Default: 'true'
# [*repo_version*]
# The major version of td-agent to install
# Default: 3
# [*package_ensure*] # [*package_ensure*]
# Package ensure # Package ensure
# Default: 'installed' # Default: 'installed'
@ -66,6 +69,7 @@
# #
class fluentd ( class fluentd (
Boolean $repo_manage = $::fluentd::params::repo_manage, Boolean $repo_manage = $::fluentd::params::repo_manage,
Integer $repo_version = $::fluentd::params::repo_version,
String $package_ensure = $::fluentd::params::package_ensure, String $package_ensure = $::fluentd::params::package_ensure,
String $package_name = $::fluentd::params::package_name, String $package_name = $::fluentd::params::package_name,
Array $package_install_options = $::fluentd::params::package_install_options, Array $package_install_options = $::fluentd::params::package_install_options,

View File

@ -18,6 +18,8 @@ class fluentd::params {
$user_name = 'td-agent' $user_name = 'td-agent'
$user_group = 'td-agent' $user_group = 'td-agent'
$user_groups = ['adm'] $user_groups = ['adm']
# repo params
$repo_version = 3
case $::osfamily { case $::osfamily {
'Debian': { 'Debian': {

View File

@ -2,7 +2,7 @@
# #
class fluentd::repo::apt ( class fluentd::repo::apt (
$ensure = 'present', $ensure = 'present',
$location = downcase("http://packages.treasuredata.com/2/${::lsbdistid}/${::lsbdistcodename}"), $location = downcase("http://packages.treasuredata.com/${::fluentd::repo_version}/${::lsbdistid}/${::lsbdistcodename}"),
$release = $::lsbdistcodename, $release = $::lsbdistcodename,
$repos = 'contrib', $repos = 'contrib',
$architecture = $::architecture, $architecture = $::architecture,

View File

@ -3,7 +3,7 @@
class fluentd::repo::yum ( class fluentd::repo::yum (
$ensure = 'present', $ensure = 'present',
$descr = 'TreasureData', $descr = 'TreasureData',
$baseurl = 'https://packages.treasuredata.com/2/redhat/$releasever/$basearch', $baseurl = "https://packages.treasuredata.com/${::fluentd::repo_version}/redhat/\$releasever/\$basearch",
$enabled = '1', $enabled = '1',
$gpgcheck = '1', $gpgcheck = '1',
$gpgkey = 'https://packages.treasuredata.com/GPG-KEY-td-agent', $gpgkey = 'https://packages.treasuredata.com/GPG-KEY-td-agent',