Merge pull request #827 from vchepkov/docker-ce-cli-fix

chelnak · web-flow · commit 965cea5c8c0e · 2022-05-06T10:57:56.000Z
Only install docker-ce-cli with docker-ce
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|

Original file line number	Diff line number	Diff line change
`@@ -59,12 +59,6 @@`
`59`	`59`	`'name' => values['docker_package_name'],`
`60`	`60`	`)`
`61`	`61`	`}`
`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`		`- }`
`68`	`62`
`69`	`63`	`if ensure_value == 'absent'`
`70`	`64`	`_params['dependent_packages'].each do \|dependent_package\|`