summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2017-03-14 00:04:15 +0100
committervarac <varacanero@zeromail.org>2017-03-16 14:00:48 +0100
commit168013abf257df1576bc69f907729db60c1fb04a (patch)
treea1590fd20fac538bff838b91b12e98efd61c6ad5
parentc331da4033e574a88afef175c1ef0a6a28558ea8 (diff)
Make platform apt dist/component configurable
-rw-r--r--provider_base/common.json3
-rw-r--r--puppet/modules/site_apt/manifests/init.pp7
-rw-r--r--puppet/modules/site_apt/manifests/leap_repo.pp2
3 files changed, 10 insertions, 2 deletions
diff --git a/provider_base/common.json b/provider_base/common.json
index dfdc8ff4..2cf9cf72 100644
--- a/provider_base/common.json
+++ b/provider_base/common.json
@@ -75,7 +75,8 @@
},
"platform": {
"apt": {
- "basic": "http://deb.leap.se/experimental-gitbuildpackage"
+ "basic": "http://deb.leap.se/0.9",
+ "component": "main"
}
},
"soledad": {
diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp
index 26bd2c6a..798d0b84 100644
--- a/puppet/modules/site_apt/manifests/init.pp
+++ b/puppet/modules/site_apt/manifests/init.pp
@@ -12,6 +12,13 @@ class site_apt {
# leap repo url
$platform_sources = $sources['platform']
$apt_url_platform_basic = $platform_sources['apt']['basic']
+ $apt_platform_component = $platform_sources['apt']['component']
+
+ if ( $platform_sources['apt']['codename'] == '') {
+ $apt_platform_codename = $::lsbdistcodename
+ } else {
+ $apt_platform_codename = $platform_sources['apt']['codename']
+ }
# needed on jessie hosts for getting pnp4nagios from testing
if ( $::operatingsystemmajrelease == '8' ) {
diff --git a/puppet/modules/site_apt/manifests/leap_repo.pp b/puppet/modules/site_apt/manifests/leap_repo.pp
index 5eedce45..3d95d8b6 100644
--- a/puppet/modules/site_apt/manifests/leap_repo.pp
+++ b/puppet/modules/site_apt/manifests/leap_repo.pp
@@ -5,7 +5,7 @@ class site_apt::leap_repo {
$major_version = $platform['major_version']
apt::sources_list { 'leap.list':
- content => "deb ${::site_apt::apt_url_platform_basic} ${::lsbdistcodename} main\n",
+ content => "deb ${::site_apt::apt_url_platform_basic} ${::site_apt::apt_platform_codename} ${::site_apt::apt_platform_component}\n",
before => Exec[refresh_apt]
}