Only install docker-ce-cli with docker-ce

In garethr#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 #797
cegeka · May 5, 2022 · f9de6a1 · f9de6a1
1 parent 27e03e6
commit f9de6a1
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 10 deletions.
diff --git a/manifests/install.pp b/manifests/install.pp
@@ -80,10 +80,6 @@
               ensure => $ensure,
               name   => $docker::docker_package_name,
         }))
-        ensure_resource('package', 'docker-ce-cli', merge($docker_hash, {
-              ensure => $ensure,
-              name   => $docker::docker_ce_cli_package_name,
-        }))
 
         if $ensure == 'absent' {
           ensure_resource('package', $dependent_packages, {

diff --git a/spec/shared_examples/install.rb b/spec/shared_examples/install.rb
@@ -59,12 +59,6 @@
           'name'   => values['docker_package_name'],
         )
       }
-      it {
-        is_expected.to contain_package('docker-ce-cli').with(
-          'ensure' => ensure_value,
-          'name'   => _params['docker_ce_cli_package_name'],
-        )
-      }
 
       if ensure_value == 'absent'
         _params['dependent_packages'].each do |dependent_package|