Skip to content

Commit 81c14ff

Browse files
kenyonvchepkov
authored andcommitted
Only install docker-ce-cli with docker-ce
In puppetlabs#740 I mistakenly added code that manages the docker-ce-cli package when managing the "docker" package. The docker-ce-cli package should only be managed when also managing the docker-ce package. Fixes puppetlabs#797
1 parent 8d3b190 commit 81c14ff

File tree

2 files changed

+0
-10
lines changed

2 files changed

+0
-10
lines changed

Diff for: manifests/install.pp

-4
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,6 @@
8080
ensure => $ensure,
8181
name => $docker::docker_package_name,
8282
}))
83-
ensure_resource('package', 'docker-ce-cli', merge($docker_hash, {
84-
ensure => $ensure,
85-
name => $docker::docker_ce_cli_package_name,
86-
}))
8783

8884
if $ensure == 'absent' {
8985
ensure_resource('package', $dependent_packages, {

Diff for: spec/shared_examples/install.rb

-6
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,6 @@
5959
'name' => values['docker_package_name'],
6060
)
6161
}
62-
it {
63-
is_expected.to contain_package('docker-ce-cli').with(
64-
'ensure' => ensure_value,
65-
'name' => _params['docker_ce_cli_package_name'],
66-
)
67-
}
6862

6963
if ensure_value == 'absent'
7064
_params['dependent_packages'].each do |dependent_package|

0 commit comments

Comments
 (0)