From f9de6a15dc861755ba59a7e5a4dccf029f173b4b Mon Sep 17 00:00:00 2001
From: Kenyon Ralph <kenyon@kenyonralph.com>
Date: Sun, 13 Feb 2022 11:40:04 -0800
Subject: [PATCH] Only install docker-ce-cli with docker-ce

In #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
---
 manifests/install.pp            | 4 ----
 spec/shared_examples/install.rb | 6 ------
 2 files changed, 10 deletions(-)

diff --git a/manifests/install.pp b/manifests/install.pp
index 566bb700..039effbe 100644
--- 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
index d8e31bdc..c6e08138 100644
--- 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|