From e99752e09a784629b89a2f798109804b11a1e8a4 Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 27 Jan 2015 22:14:26 +0100 Subject: use apt.url hiera value for customizing apt sources url Change-Id: Ib18c9031df13dab3187e0bb0f2202ffddd0d228d --- puppet/modules/site_apt/manifests/init.pp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'puppet/modules/site_apt') diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp index 633ccf1e..7e63eaf1 100644 --- a/puppet/modules/site_apt/manifests/init.pp +++ b/puppet/modules/site_apt/manifests/init.pp @@ -1,7 +1,12 @@ class site_apt { + $apt_config = hiera('apt') + $apt_url = $apt_config['url'] + class { 'apt': - custom_key_dir => 'puppet:///modules/site_apt/keys' + custom_key_dir => 'puppet:///modules/site_apt/keys', + debian_url => $apt_url, + backports_url => $apt_url } # enable http://deb.leap.se debian package repository -- cgit v1.2.3 From 1b3455a697ae74b34f28f4960bf0a274e27a1ee8 Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 27 Jan 2015 22:40:08 +0100 Subject: provide way to customize all three apt sources urls (basic, security, backports) Change-Id: I5542b320bb1edb52c63350b5e4fd2af681991fb5 --- puppet/modules/site_apt/manifests/init.pp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'puppet/modules/site_apt') diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp index 7e63eaf1..506591dc 100644 --- a/puppet/modules/site_apt/manifests/init.pp +++ b/puppet/modules/site_apt/manifests/init.pp @@ -1,12 +1,16 @@ class site_apt { - $apt_config = hiera('apt') - $apt_url = $apt_config['url'] + $apt_config = hiera('apt') + $apt_url = $apt_config['url'] + $apt_url_basic = $apt_url['basic'] + $apt_url_security = $apt_url['security'] + $apt_url_backports = $apt_url['backports'] class { 'apt': custom_key_dir => 'puppet:///modules/site_apt/keys', - debian_url => $apt_url, - backports_url => $apt_url + debian_url => $apt_url_basic, + security_url => $apt_url_security, + backports_url => $apt_url_backports } # enable http://deb.leap.se debian package repository -- cgit v1.2.3