From 58740a79e137c40591ea73e16646753d9e3b08fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jannik=20Jungh=C3=A4nel?= Date: Tue, 3 Dec 2019 12:43:30 +0100 Subject: [PATCH 1/3] Support custom package source --- manifests/init.pp | 1 + manifests/install.pp | 2 ++ 2 files changed, 3 insertions(+) diff --git a/manifests/init.pp b/manifests/init.pp index 37409cc..4044c42 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -18,6 +18,7 @@ $log_options = $chrony::params::log_options, $package_ensure = $chrony::params::package_ensure, $package_name = $chrony::params::package_name, + $package_source = $chrony::package_source, $refclocks = $chrony::params::refclocks, $peers = $chrony::params::peers, $servers = $chrony::params::servers, diff --git a/manifests/install.pp b/manifests/install.pp index 902a9fe..1623a41 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -2,10 +2,12 @@ class chrony::install ( $package_ensure = $chrony::package_ensure, $package_name = $chrony::package_name, + $package_source = $chrony::package_source, ) inherits chrony { package { 'chrony': ensure => $package_ensure, name => $package_name, + source => $package_source, } } From 518b7be04ec86f77f070a4b34767930e973da2c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jannik=20Jungh=C3=A4nel?= Date: Tue, 3 Dec 2019 12:57:06 +0100 Subject: [PATCH 2/3] Support custom package provider --- manifests/init.pp | 1 + manifests/install.pp | 14 ++++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 4044c42..74fcd75 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -19,6 +19,7 @@ $package_ensure = $chrony::params::package_ensure, $package_name = $chrony::params::package_name, $package_source = $chrony::package_source, + $package_provider = $chrony::package_provider, $refclocks = $chrony::params::refclocks, $peers = $chrony::params::peers, $servers = $chrony::params::servers, diff --git a/manifests/install.pp b/manifests/install.pp index 1623a41..3c4d9f6 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -1,13 +1,15 @@ # install chrony class chrony::install ( - $package_ensure = $chrony::package_ensure, - $package_name = $chrony::package_name, - $package_source = $chrony::package_source, + $package_ensure = $chrony::package_ensure, + $package_name = $chrony::package_name, + $package_source = $chrony::package_source, + $package_provider = $chrony::package_provider, ) inherits chrony { package { 'chrony': - ensure => $package_ensure, - name => $package_name, - source => $package_source, + ensure => $package_ensure, + name => $package_name, + source => $package_source, + provider => $package_provider, } } From 778cbbfd33ba71b3d70326d291fe6db8647b8431 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jannik=20Jungh=C3=A4nel?= Date: Tue, 3 Dec 2019 13:26:53 +0100 Subject: [PATCH 3/3] Make new parameters optional --- manifests/init.pp | 4 ++-- manifests/params.pp | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 74fcd75..a737032 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -18,8 +18,8 @@ $log_options = $chrony::params::log_options, $package_ensure = $chrony::params::package_ensure, $package_name = $chrony::params::package_name, - $package_source = $chrony::package_source, - $package_provider = $chrony::package_provider, + Optional[String] $package_source = $chrony::params::package_source, + Optional[String] $package_provider = $chrony::params::package_provider, $refclocks = $chrony::params::refclocks, $peers = $chrony::params::peers, $servers = $chrony::params::servers, diff --git a/manifests/params.pp b/manifests/params.pp index fc0f959..0b8fed6 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -4,6 +4,8 @@ $keys = [] $log_options = undef $package_ensure = 'present' + $package_provider = undef + $package_source = undef $refclocks = [] $peers = [] $service_enable = true