Skip to content

Commit 578d8b2

Browse files
committed
Added compatibility with facter 2.4.6 #626
1 parent ec3159f commit 578d8b2

File tree

2 files changed

+23
-6
lines changed

2 files changed

+23
-6
lines changed

manifests/params.pp

+15-3
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,11 @@
136136
}
137137
}
138138
default: {
139-
$package_release = "debian-${facts['os']['distro']['codename']}"
139+
if (versioncmp($facts['facterversion'], '2.4.6') <= 0) {
140+
$package_release = "debian-${facts['os']['lsb']['distcodename']}"
141+
} else {
142+
$package_release = "debian-${facts['os']['distro']['codename']}"
143+
}
140144
$service_provider = 'systemd'
141145
$storage_config = '/etc/default/docker-storage'
142146
$service_config_template = 'docker/etc/sysconfig/docker.systemd.erb'
@@ -164,15 +168,23 @@
164168
$package_ce_source_location = "https://download.docker.com/linux/${os_lc}"
165169
$package_ce_key_source = "https://download.docker.com/linux/${os_lc}/gpg"
166170
$package_ce_key_id = '9DC858229FC7DD38854AE2D88D81803C0EBFCD88'
167-
$package_ce_release = $facts['os']['distro']['codename']
171+
if (versioncmp($facts['facterversion'], '2.4.6') <= 0) {
172+
$package_ce_release = $facts['os']['lsb']['distcodename']
173+
} else {
174+
$package_ce_release = $facts['os']['distro']['codename']
175+
}
168176
$package_source_location = 'http://apt.dockerproject.org/repo'
169177
$package_key_source = 'https://apt.dockerproject.org/gpg'
170178
$package_key_check_source = undef
171179
$package_key_id = '58118E89F3A912897C070ADBF76221572C52609D'
172180
$package_ee_source_location = $docker_ee_source_location
173181
$package_ee_key_source = $docker_ee_key_source
174182
$package_ee_key_id = $docker_ee_key_id
175-
$package_ee_release = $facts['os']['distro']['codename']
183+
if (versioncmp($facts['facterversion'], '2.4.6') <= 0) {
184+
$package_ee_release = $facts['os']['lsb']['distcodename']
185+
} else {
186+
$package_ee_release = $facts['os']['distro']['codename']
187+
}
176188
$package_ee_repos = $docker_ee_repos
177189
$package_ee_package_name = $docker_ee_package_name
178190

manifests/repos.pp

+8-3
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,15 @@
5353
if $docker::manage_package {
5454
include apt
5555

56-
if $facts['os']['name'] == 'Debian' and $facts['os']['distro']['codename'] == 'wheezy' {
57-
include apt::backports
56+
if (versioncmp($facts['facterversion'], '2.4.6') <= 0) {
57+
if $facts['os']['name'] == 'Debian' and $facts['os']['lsb']['distcodename'] == 'wheezy' {
58+
include apt::backports
59+
}
60+
} else {
61+
if $facts['os']['name'] == 'Debian' and $facts['os']['distro']['codename'] == 'wheezy' {
62+
include apt::backports
63+
}
5864
}
59-
6065
Exec['apt_update'] -> Package[$docker::prerequired_packages]
6166
Apt::Source['docker'] -> Package['docker']
6267
}

0 commit comments

Comments
 (0)