Remove ensure-packages

voxpupuli · Sep 13, 2023 · 4edb99f · 4edb99f
1 parent 8881c43
commit 4edb99f
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 25 deletions.
diff --git a/manifests/install.pp b/manifests/install.pp
@@ -47,17 +47,17 @@
   case $python::provider {
     'pip': {
       if $python::manage_pip_package {
-        ensure_packages (['pip'],
+        package { 'pip':
           ensure  => $python::pip,
           require => Package['python'],
-        )
+        }
       }
 
       if $pythondev {
-        ensure_packages (['python-dev'],
+        package { 'python-dev':
           ensure => $python::dev,
           name   => $pythondev,
-        )
+        }
       }
 
       # Respect the $python::pip setting
@@ -180,28 +180,28 @@
           }
 
           if $pythondev {
-            ensure_packages (['python-dev'],
-              ensure => $python::dev,
-              name   => $pythondev,
-              alias  => $pythondev,
+            package { 'python-dev':
+              ensure   => $python::dev,
+              name     => $pythondev,
+              alias    => $pythondev,
               provider => 'yum',
-            )
+            }
           }
         }
         default: {
           if $python::manage_pip_package {
-            ensure_packages (['pip'],
+            package { 'pip':
               ensure  => $python::pip,
               require => Package['python'],
-            )
+            }
           }
 
           if $pythondev {
-            ensure_packages (['python-dev'],
+            package { 'python-dev':
               ensure => $python::dev,
               name   => $pythondev,
               alias  => $pythondev,
-            )
+            }
           }
         }
       }

diff --git a/spec/classes/python_spec.rb b/spec/classes/python_spec.rb
@@ -50,15 +50,15 @@
           {
             manage_pip_package: true,
             manage_venv_package: true,
-            pip: 'installed',
-            venv: 'installed'
+            pip: 'present',
+            venv: 'present'
           }
         end
 
         it { is_expected.to compile.with_all_deps }
-        it { is_expected.to contain_package('pip').with(ensure: 'installed') }
+        it { is_expected.to contain_package('pip').with(ensure: 'present') }
 
-        it { is_expected.to contain_package('python-venv').with(ensure: 'installed') } unless facts[:os]['name'] == 'CentOS'
+        it { is_expected.to contain_package('python-venv').with(ensure: 'present') } unless facts[:os]['name'] == 'CentOS'
       end
 
       case facts[:os]['family']
@@ -86,10 +86,10 @@
           # rubocop:disable RSpec/RepeatedExampleGroupDescription
           describe 'with python::dev' do
             context 'true' do
-              let(:params) { { dev: 'installed' } }
+              let(:params) { { dev: 'present' } }
 
               it { is_expected.to compile.with_all_deps }
-              it { is_expected.to contain_package('python-dev').with_ensure('installed') }
+              it { is_expected.to contain_package('python-dev').with_ensure('present') }
             end
 
             context 'empty/default' do
@@ -233,9 +233,9 @@
 
           describe 'with python::dev' do
             context 'true' do
-              let(:params) { { dev: 'installed' } }
+              let(:params) { { dev: 'present' } }
 
-              it { is_expected.to contain_package('python-dev').with_ensure('installed') }
+              it { is_expected.to contain_package('python-dev').with_ensure('present') }
             end
 
             context 'default/empty' do
@@ -417,9 +417,9 @@
 
           describe 'with python::dev' do
             context 'true' do
-              let(:params) { { dev: 'installed' } }
+              let(:params) { { dev: 'present' } }
 
-              it { is_expected.to contain_package('python-dev').with_ensure('installed') }
+              it { is_expected.to contain_package('python-dev').with_ensure('present') }
             end
 
             context 'empty/default' do
@@ -467,9 +467,9 @@
 
           describe 'with python::dev' do
             context 'true' do
-              let(:params) { { dev: 'installed' } }
+              let(:params) { { dev: 'present' } }
 
-              it { is_expected.to contain_package('python-dev').with_ensure('installed') }
+              it { is_expected.to contain_package('python-dev').with_ensure('present') }
             end
 
             context 'default/empty' do