Skip to content

Commit 4484f4f

Browse files
LukasAudLukasAud
authored
Merge pull request #808 from david22swan/GH-iac-334/main/remove_compatible_code
(GH-iac-334) Remove code specific to unsupported OSs
2 parents c58a2a8 + caa0691 commit 4484f4f

File tree

10 files changed

+30
-76
lines changed

10 files changed

+30
-76
lines changed

‎spec/acceptance/compose_v3_spec.rb‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@
1313
'nanoserver-sac2016'
1414
end
1515
else
16-
docker_args = if os[:name] == 'ubuntu' && os[:release][:full] == '14.04'
17-
"version => '18.06.1~ce~3-0~ubuntu'"
18-
else
19-
''
20-
end
16+
docker_args = ''
2117
install_dir = '/usr/local/bin'
2218
file_extension = ''
2319
tmp_path = '/tmp'

‎spec/acceptance/docker_custom_source_spec.rb‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,11 @@
1111
default_docker_run_arg = "restart => 'always', net => 'nat',"
1212
default_run_command = 'ping 127.0.0.1 -t'
1313
docker_command = '"/cygdrive/c/Program Files/Docker/docker"'
14-
skip = false
15-
elsif os[:name] == 'Ubuntu' && os[:release][:full] == '14.04'
16-
docker_args = "version => '18.06.1~ce~3-0~ubuntu'"
17-
default_image = 'busybox'
18-
skip = true
1914
else
2015
docker_args = ''
2116
default_image = 'busybox'
22-
skip = false
2317
end
18+
skip = false
2419

2520
describe 'the Puppet Docker module' do
2621
context 'with download location', skip: skip do

‎spec/acceptance/docker_full_spec.rb‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,7 @@
2626
docker_mount_path = 'C:/Users/Public/DockerVolume'
2727
storage_driver = 'windowsfilter'
2828
else
29-
docker_args = if os[:name] == 'ubuntu' && os[:release][:full] == '14.04'
30-
"version => '18.06.1~ce~3-0~ubuntu'"
31-
else
32-
''
33-
end
29+
docker_args = ''
3430
default_image = 'alpine'
3531
second_image = 'busybox'
3632
default_image_tag = '3.7'
@@ -45,9 +41,7 @@
4541
default_docker_exec_command = 'touch /root/test_file.txt'
4642
docker_mount_path = '/root'
4743
storage_driver = 'devicemapper'
48-
storage_driver = if os[:family] == 'Debian' && os[:release][:major] =~ %r{14.04|^8$}
49-
'aufs'
50-
elsif os[:family] == 'RedHat'
44+
storage_driver = if os[:family] == 'RedHat'
5145
'devicemapper'
5246
else
5347
'overlay2'
@@ -823,7 +817,7 @@ class { 'docker': #{docker_args} }
823817

824818
if os[:family] == 'windows'
825819
apply_manifest(pp5, catch_failures: true)
826-
elsif %r{14.04|^8$}.match?(os[:release])
820+
elsif %r{^8$}.match?(os[:release])
827821
apply_manifest(pp5, catch_failures: true) do |r|
828822
expect(r.stdout).to match(%r{container_3_7_3})
829823
end

‎spec/acceptance/docker_spec.rb‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,7 @@
2121
bad_server_strip = "#{registry_host}_5001"
2222
broken = true
2323
else
24-
docker_args = if os[:name] == 'ubuntu' && os[:release][:full] == '14.04'
25-
"version => '18.06.1~ce~3-0~ubuntu'"
26-
else
27-
''
28-
end
24+
docker_args = ''
2925
docker_registry_image = 'registry'
3026
docker_network = 'bridge'
3127
registry_host = '127.0.0.1'

‎spec/acceptance/network_spec.rb‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
if os[:family] == 'windows'
1010
puts 'Not implemented on Windows'
1111
broken = true
12-
elsif os[:name] == 'ubuntu' && os[:release][:full] == '14.04'
13-
docker_args = "version => '18.06.1~ce~3-0~ubuntu'"
14-
else
1512
docker_args = ''
1613
end
1714

‎spec/acceptance/plugin_spec.rb‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
if os[:family] == 'windows'
1010
puts 'Not implemented on Windows'
1111
broken = true
12-
elsif os[:name] == 'ubuntu' && os[:release][:full] == '14.04'
13-
docker_args = "version => '18.06.1~ce~3-0~ubuntu'"
1412
else
1513
docker_args = ''
1614
end

‎spec/acceptance/stack_spec.rb‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,7 @@
77
tmp_path = 'C:\\tmp\\'
88
wait_for_container_seconds = 120
99
else
10-
docker_args = if os[:name] == 'ubuntu' && os[:release][:full] == '14.04'
11-
"version => '18.06.1~ce~3-0~ubuntu'"
12-
else
13-
''
14-
end
10+
docker_args = ''
1511
tmp_path = '/tmp/'
1612
wait_for_container_seconds = 10
1713
end

‎spec/acceptance/volume_spec.rb‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77
if os[:family] == 'windows'
88
docker_args = 'docker_ee => true'
99
command = '"/cygdrive/c/Program Files/Docker/docker"'
10-
elsif os[:name] == 'ubuntu' && os[:release][:full] == '14.04'
11-
docker_args = "version => '18.06.1~ce~3-0~ubuntu'"
12-
command = 'docker'
1310
else
1411
docker_args = ''
1512
command = 'docker'

‎spec/helper/get_defaults.rb‎

Lines changed: 9 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -112,28 +112,15 @@ def get_defaults(_facts)
112112
case _facts[:os]['name']
113113
when 'Ubuntu'
114114
package_release = "ubuntu-#{_facts[:os]['distro']['codename']}"
115-
116-
if _facts[:os]['release']['full'] != '14.04'
117-
service_after_override = :undef
118-
service_config_template = 'docker/etc/sysconfig/docker.systemd.erb'
119-
service_hasrestart = true
120-
service_hasstatus = true
121-
service_overrides_template = 'docker/etc/systemd/system/docker.service.d/service-overrides-debian.conf.erb'
122-
service_provider = 'systemd'
123-
socket_override = false
124-
socket_overrides_template = 'docker/etc/systemd/system/docker.socket.d/socket-overrides.conf.erb'
125-
storage_config = '/etc/default/docker-storage'
126-
else
127-
service_after_override = :undef
128-
service_config_template = 'docker/etc/default/docker.erb'
129-
service_hasrestart = false
130-
service_hasstatus = true
131-
service_overrides_template = :undef
132-
service_provider = 'upstart'
133-
socket_override = false
134-
socket_overrides_template = :undef
135-
storage_config = :undef
136-
end
115+
service_after_override = :undef
116+
service_config_template = 'docker/etc/sysconfig/docker.systemd.erb'
117+
service_hasrestart = true
118+
service_hasstatus = true
119+
service_overrides_template = 'docker/etc/systemd/system/docker.service.d/service-overrides-debian.conf.erb'
120+
service_provider = 'systemd'
121+
socket_override = false
122+
socket_overrides_template = 'docker/etc/systemd/system/docker.socket.d/socket-overrides.conf.erb'
123+
storage_config = '/etc/default/docker-storage'
137124
else
138125
package_release = "debian-#{_facts[:os]['distro']['codename']}"
139126
service_after_override = :undef

‎spec/shared_examples/params.rb‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,19 @@
33
shared_examples 'params' do |_facts|
44
case _facts[:os]['family']
55
when 'Debian'
6-
if _facts[:os]['release']['full'] != '14.04'
7-
it {
8-
is_expected.to contain_class('docker::params')
9-
is_expected.to contain_class('docker::systemd_reload')
10-
is_expected.to contain_exec('docker-systemd-reload').with(
11-
'path' => [
12-
'/bin/',
13-
'/sbin/',
14-
'/usr/bin/',
15-
'/usr/sbin/',
16-
],
17-
'command' => 'systemctl daemon-reload',
18-
'refreshonly' => 'true',
19-
)
20-
}
21-
end
6+
it {
7+
is_expected.to contain_class('docker::params')
8+
is_expected.to contain_class('docker::systemd_reload')
9+
is_expected.to contain_exec('docker-systemd-reload').with(
10+
'path' => [
11+
'/bin/',
12+
'/sbin/',
13+
'/usr/bin/',
14+
'/usr/sbin/',
15+
],
16+
'command' => 'systemctl daemon-reload',
17+
'refreshonly' => 'true',
18+
)
19+
}
2220
end
2321
end

0 commit comments

Comments
 (0)