Skip to content

Commit b136200

Browse files
crazymind1337crazymind1337
committed
drop legacy facts, use $facts-Hash
1 parent 2f55783 commit b136200

16 files changed

+55
-55
lines changed

‎manifests/compose.pp

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
validate_re($proxy, '^((http[s]?)?:\/\/)?([^:^@]+:[^:^@]+@|)([\da-z\.-]+)\.([\da-z\.]{2,6})(:[\d])?([\/\w \.-]*)*\/?$')
5656
}
5757

58-
if $::osfamily == 'windows' {
58+
if $facts['os']['family'] == 'windows' {
5959
$file_extension = '.exe'
6060
$file_owner = 'Administrator'
6161
} else {
@@ -79,7 +79,7 @@
7979
$proxy_opt = ''
8080
}
8181

82-
if $::osfamily == 'windows' {
82+
if $facts['os']['family'] == 'windows' {
8383
$docker_download_command = "if (Invoke-WebRequest ${docker_compose_url} ${proxy_opt} -UseBasicParsing -OutFile \"${docker_compose_location_versioned}\") { exit 0 } else { exit 1}" # lint:ignore:140chars
8484

8585
exec { "Install Docker Compose ${version}":

‎manifests/config.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# == Class: docker::config
22
#
33
class docker::config {
4-
if $::osfamily != 'windows' {
4+
if $facts['os']['family'] != 'windows' {
55
docker::system_user { $docker::docker_users: }
66
} else {
77
docker::windows_account { $docker::docker_users: }

‎manifests/exec.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
$docker_command = $docker::params::docker_command
2020

21-
if $::osfamily == 'windows' {
21+
if $facts['os']['family'] == 'windows' {
2222
$exec_environment = "PATH=${::docker_program_files_path}/Docker/"
2323
$exec_timeout = 3000
2424
$exec_path = [ "${::docker_program_files_path}/Docker/", ]

‎manifests/image.pp

+4-4
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
$docker_command = $docker::params::docker_command
3939

40-
if $::osfamily == 'windows' {
40+
if $facts['os']['family'] == 'windows' {
4141
$update_docker_image_template = 'docker/windows/update_docker_image.ps1.erb'
4242
$update_docker_image_path = "${::docker_user_temp_path}/update_docker_image.ps1"
4343
$exec_environment = "PATH=${::docker_program_files_path}/Docker/"
@@ -106,7 +106,7 @@
106106
$image_find = "${docker_command} images -q ${image}"
107107
}
108108

109-
if $::osfamily == 'windows' {
109+
if $facts['os']['family'] == 'windows' {
110110
$_image_find = "If (-not (${image_find}) ) { Exit 1 }"
111111
} else {
112112
$_image_find = "${image_find} | grep ."
@@ -117,15 +117,15 @@
117117
} elsif $docker_dir {
118118
$image_install = "${docker_command} build -t ${image_arg} ${docker_dir}"
119119
} elsif $docker_file {
120-
if $::osfamily == windows {
120+
if $facts['os']['family'] == windows {
121121
$image_install = "Get-Content ${docker_file} -Raw | ${docker_command} build -t ${image_arg} -"
122122
} else {
123123
$image_install = "${docker_command} build -t ${image_arg} - < ${docker_file}"
124124
}
125125
} elsif $docker_tar {
126126
$image_install = "${docker_command} load -i ${docker_tar}"
127127
} else {
128-
if $::osfamily == 'windows' {
128+
if $facts['os']['family'] == 'windows' {
129129
$image_install = "& ${update_docker_image_path} -DockerImage ${image_arg}"
130130
} else {
131131
$image_install = "${update_docker_image_path} ${image_arg}"

‎manifests/init.pp

+8-8
Original file line numberDiff line numberDiff line change
@@ -508,13 +508,13 @@
508508
Optional[String] $docker_msft_provider_version = $docker::params::docker_msft_provider_version,
509509
Optional[String] $nuget_package_provider_version = $docker::params::nuget_package_provider_version,
510510
) inherits docker::params {
511-
if $facts['osfamily'] and !$acknowledge_unsupported_os {
512-
assert_type(Pattern[/^(Debian|RedHat|windows)$/], $facts['osfamily']) |$a, $b| {
511+
if $facts['os']['family'] and ! $acknowledge_unsupported_os {
512+
assert_type(Pattern[/^(Debian|RedHat|windows)$/], $facts['os']['family']) |$a, $b| {
513513
fail(translate('This module only works on Debian, Red Hat or Windows based systems.'))
514514
}
515515
}
516516

517-
if ($facts['operatingsystem'] == 'CentOS') and (versioncmp($facts['operatingsystemmajrelease'], '7') < 0) {
517+
if ($facts['os']['name'] == 'CentOS') and (versioncmp($facts['os']['release']['full'], '7') < 0) {
518518
fail(translate('This module only works on CentOS version 7 and higher based systems.'))
519519
}
520520

@@ -529,7 +529,7 @@
529529
}
530530

531531
if $log_driver {
532-
if $facts['osfamily'] == 'windows' {
532+
if $facts['os']['family'] == 'windows' {
533533
assert_type(Pattern[/^(none|json-file|syslog|gelf|fluentd|splunk|awslogs|etwlogs)$/], $log_driver) |$a, $b| {
534534
fail(translate('log_driver must be one of none, json-file, syslog, gelf, fluentd, splunk, awslogs or etwlogs'))
535535
}
@@ -541,7 +541,7 @@
541541
}
542542

543543
if $storage_driver {
544-
if $facts['osfamily'] == 'windows' {
544+
if $facts['os']['family'] == 'windows' {
545545
assert_type(Pattern[/^(windowsfilter)$/], $storage_driver) |$a, $b| {
546546
fail(translate('Valid values for storage_driver on windows are windowsfilter'))
547547
}
@@ -552,7 +552,7 @@
552552
}
553553
}
554554

555-
if ($bridge) and ($facts['osfamily'] == 'windows') {
555+
if ($bridge) and ($facts['os']['family'] == 'windows') {
556556
assert_type(Pattern[/^(none|nat|transparent|overlay|l2bridge|l2tunnel)$/], $bridge) |$a, $b| {
557557
fail(translate('bridge must be one of none, nat, transparent, overlay, l2bridge or l2tunnel on Windows.'))
558558
}
@@ -601,7 +601,7 @@
601601
$docker_start_command = $docker::docker_ee_start_command
602602
$docker_package_name = $docker::docker_ee_package_name
603603
} else {
604-
case $facts['osfamily'] {
604+
case $facts['os']['family'] {
605605
'Debian' : {
606606
$package_location = $docker_ce_source_location
607607
$package_key_source = $docker_ce_key_source
@@ -628,7 +628,7 @@
628628
$docker_package_name = $docker_ce_package_name
629629
}
630630
} else {
631-
case $facts['osfamily'] {
631+
case $facts['os']['family'] {
632632
'Debian' : {
633633
$package_location = $docker_package_location
634634
$package_key_source = $docker_package_key_source

‎manifests/install.pp

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
) {
2929
$docker_start_command = $docker::docker_start_command
3030

31-
if $::osfamily and ! $docker::acknowledge_unsupported_os {
32-
assert_type(Pattern[/^(Debian|RedHat|windows)$/], $::osfamily) |$a, $b| {
31+
if $facts['os']['family'] and ! $docker::acknowledge_unsupported_os {
32+
assert_type(Pattern[/^(Debian|RedHat|windows)$/], $facts['os']['family']) |$a, $b| {
3333
fail(translate('This module only works on Debian, RedHat or Windows.'))
3434
}
3535
}
@@ -47,7 +47,7 @@
4747
}
4848

4949
if $docker::package_source {
50-
case $::osfamily {
50+
case $facts['os']['family'] {
5151
'Debian' : {
5252
$pk_provider = 'dpkg'
5353
}
@@ -83,7 +83,7 @@
8383

8484

8585
} else {
86-
if $::osfamily != 'windows' {
86+
if $facts['os']['family'] != 'windows' {
8787
ensure_resource('package', 'docker', merge($docker_hash, {
8888
ensure => $ensure,
8989
name => $docker::docker_package_name,

‎manifests/machine.pp

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
validate_re($proxy, '^((http[s]?)?:\/\/)?([^:^@]+:[^:^@]+@|)([\da-z\.-]+)\.([\da-z\.]{2,6})(:[\d])?([\/\w \.-]*)*\/?$')
4040
}
4141

42-
if $::osfamily == 'windows' {
42+
if $facts['os']['family'] == 'windows' {
4343
$file_extension = '.exe'
4444
$file_owner = 'Administrator'
4545
} else {
@@ -62,7 +62,7 @@
6262
$proxy_opt = ''
6363
}
6464

65-
if $::osfamily == 'windows' {
65+
if $facts['os']['family'] == 'windows' {
6666
$docker_download_command = "if (Invoke-WebRequest ${docker_machine_url} ${proxy_opt} -UseBasicParsing -OutFile \"${docker_machine_location_versioned}\") { exit 0 } else { exit 1}" # lint:ignore:140chars
6767

6868
exec { "Install Docker Machine ${version}":

‎manifests/params.pp

+14-14
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,11 @@
8585
$storage_config_template = 'docker/etc/sysconfig/docker-storage.erb'
8686
$registry_mirror = undef
8787
$curl_ensure = true
88-
$os_lc = downcase($::operatingsystem)
88+
$os_lc = downcase($facts['os']['name'])
8989
$docker_msft_provider_version = undef
9090
$nuget_package_provider_version = undef
9191

92-
if ($::osfamily == 'windows') {
92+
if ($facts['os']['family'] == 'windows') {
9393
$docker_ee_package_name = 'Docker'
9494
$tls_cacert = "${::docker_program_data_path}/docker/certs.d/ca.pem"
9595
$tls_cert = "${::docker_program_data_path}/docker/certs.d/server-cert.pem"
@@ -109,13 +109,13 @@
109109
$docker_command = 'docker'
110110
}
111111

112-
case $::osfamily {
112+
case $facts['os']['family'] {
113113
'Debian' : {
114-
case $::operatingsystem {
114+
case $facts['os']['name'] {
115115
'Ubuntu' : {
116-
$package_release = "ubuntu-${::lsbdistcodename}"
116+
$package_release = "ubuntu-${facts['os']['distro']['codename']}"
117117

118-
if (versioncmp($::operatingsystemrelease, '15.04') >= 0) {
118+
if (versioncmp($facts['os']['release']['full'], '15.04') >= 0) {
119119
$service_provider = 'systemd'
120120
$storage_config = '/etc/default/docker-storage'
121121
$service_config_template = 'docker/etc/sysconfig/docker.systemd.erb'
@@ -140,7 +140,7 @@
140140
}
141141
}
142142
default: {
143-
$package_release = "debian-${::lsbdistcodename}"
143+
$package_release = "debian-${facts['os']['distro']['codename']}"
144144
$service_provider = 'systemd'
145145
$storage_config = '/etc/default/docker-storage'
146146
$service_config_template = 'docker/etc/sysconfig/docker.systemd.erb'
@@ -168,15 +168,15 @@
168168
$package_ce_source_location = "https://download.docker.com/linux/${os_lc}"
169169
$package_ce_key_source = "https://download.docker.com/linux/${os_lc}/gpg"
170170
$package_ce_key_id = '9DC858229FC7DD38854AE2D88D81803C0EBFCD88'
171-
$package_ce_release = $::lsbdistcodename
171+
$package_ce_release = $facts['os']['distro']['codename']
172172
$package_source_location = 'http://apt.dockerproject.org/repo'
173173
$package_key_source = 'https://apt.dockerproject.org/gpg'
174174
$package_key_check_source = undef
175175
$package_key_id = '58118E89F3A912897C070ADBF76221572C52609D'
176176
$package_ee_source_location = $docker_ee_source_location
177177
$package_ee_key_source = $docker_ee_key_source
178178
$package_ee_key_id = $docker_ee_key_id
179-
$package_ee_release = $::lsbdistcodename
179+
$package_ee_release = $facts['os']['distro']['codename']
180180
$package_ee_repos = $docker_ee_repos
181181
$package_ee_package_name = $docker_ee_package_name
182182

@@ -201,13 +201,13 @@
201201
$service_after_override = undef
202202
$use_upstream_package_source = true
203203

204-
$package_ce_source_location = "https://download.docker.com/linux/centos/${::operatingsystemmajrelease}/${::architecture}/${docker_ce_channel}"
204+
$package_ce_source_location = "https://download.docker.com/linux/centos/${facts['os']['release']['full']}/${facts['os']['architecture']}/${docker_ce_channel}"
205205
$package_ce_key_source = 'https://download.docker.com/linux/centos/gpg'
206206
$package_ce_key_id = undef
207207
$package_ce_release = undef
208208
$package_key_id = undef
209209
$package_release = undef
210-
$package_source_location = "https://yum.dockerproject.org/repo/main/centos/${::operatingsystemmajrelease}"
210+
$package_source_location = "https://yum.dockerproject.org/repo/main/centos/${facts['os']['release']['full']}"
211211
$package_key_source = 'https://yum.dockerproject.org/gpg'
212212
$package_key_check_source = true
213213
$package_ee_source_location = $docker_ee_source_location
@@ -230,7 +230,7 @@
230230
}
231231

232232
# repo_opt to specify install_options for docker package
233-
if $::operatingsystem == 'RedHat' {
233+
if $facts['os']['name'] == 'RedHat' {
234234
$repo_opt = '--enablerepo=rhel-7-server-extras-rpms'
235235
} else {
236236
$repo_opt = undef
@@ -361,8 +361,8 @@
361361
# Special extra packages are required on some OSes.
362362
# Specifically apparmor is needed for Ubuntu:
363363
# https://github.com/docker/docker/issues/4734
364-
$prerequired_packages = $::osfamily ? {
365-
'Debian' => $::operatingsystem ? {
364+
$prerequired_packages = $facts['os']['family'] ? {
365+
'Debian' => $facts['os']['name'] ? {
366366
'Debian' => [ 'cgroupfs-mount', ],
367367
'Ubuntu' => [ 'cgroup-lite', 'apparmor', ],
368368
default => [],

‎manifests/plugin.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363

6464
$docker_command = "${docker::params::docker_command} plugin"
6565

66-
if ($::osfamily == 'windows') {
66+
if ($facts['os']['family'] == 'windows') {
6767
fail(translate('Feature not implemented on windows.'))
6868
}
6969

‎manifests/registry.pp

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747

4848
$docker_command = $docker::params::docker_command
4949

50-
if $::osfamily == 'windows' {
50+
if $facts['os']['family'] == 'windows' {
5151
$exec_environment = ["PATH=${::docker_program_files_path}/Docker/"]
5252
$exec_timeout = 3000
5353
$exec_path = ["${::docker_program_files_path}/Docker/"]
@@ -89,7 +89,7 @@
8989
}
9090

9191
if $receipt {
92-
if $::osfamily != 'windows' {
92+
if $facts['os']['family'] != 'windows' {
9393
# server may be an URI, which can contain /
9494
$server_strip = regsubst($server, '/', '_', 'G')
9595

‎manifests/repos.pp

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
$location = $docker::package_location,
66
$key_source = $docker::package_key_source,
77
$key_check_source = $docker::package_key_check_source,
8-
$architecture = $facts['architecture'],
8+
$architecture = $facts['os']['architecture'],
99
) {
1010
ensure_packages($docker::prerequired_packages)
1111

12-
case $::osfamily {
12+
case $facts['os']['family'] {
1313
'Debian': {
1414
$release = $docker::release
1515
$package_key = $docker::package_key
@@ -46,7 +46,7 @@
4646
if $docker::manage_package {
4747
include apt
4848

49-
if $::operatingsystem == 'Debian' and $::lsbdistcodename == 'wheezy' {
49+
if $facts['os']['name'] == 'Debian' and $facts['os']['distro']['codename'] == 'wheezy' {
5050
include apt::backports
5151
}
5252

‎manifests/run.pp

+5-5
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@
235235
health_check_cmd => $health_check_cmd,
236236
restart_on_unhealthy => $restart_on_unhealthy,
237237
health_check_interval => $health_check_interval,
238-
osfamily => $::osfamily,
238+
osfamily => $facts['os']['family'],
239239
}
240240
)
241241

@@ -253,7 +253,7 @@
253253
$sanitised_after_array = docker::sanitised_name($after_array)
254254
}
255255

256-
if $::osfamily == 'windows' {
256+
if $facts['os']['family'] == 'windows' {
257257
$exec_environment = "PATH=${::docker_program_files_path}/Docker/;${::docker_systemroot}/System32/"
258258
$exec_timeout = 3000
259259
$exec_path = ["${::docker_program_files_path}/Docker/"]
@@ -373,7 +373,7 @@
373373
$hasstatus = true
374374
}
375375
default: {
376-
if $::osfamily != 'windows' {
376+
if $facts['os']['family'] != 'windows' {
377377
fail(translate('Docker needs a Debian or RedHat based system.'))
378378
}
379379
elsif $ensure == 'present' {
@@ -391,7 +391,7 @@
391391
}
392392

393393
if $ensure == 'absent' {
394-
if $::osfamily == 'windows'{
394+
if $facts['os']['family'] == 'windows'{
395395
exec { "stop container ${service_prefix}${sanitised_title}":
396396
command => "${docker_command} stop --time=${stop_wait_time} ${sanitised_title}",
397397
onlyif => "${docker_command} inspect ${sanitised_title}",
@@ -420,7 +420,7 @@
420420
timeout => $exec_timeout,
421421
}
422422

423-
if $::osfamily != 'windows' {
423+
if $facts['os']['family'] != 'windows' {
424424
file { "/etc/systemd/system/${service_prefix}${sanitised_title}.service":
425425
ensure => absent,
426426
}

0 commit comments

Comments
 (0)