foreman::repo: use the package resource 'ensure' parameter to specify…

… the desired ruby stream Co-authored-by: Ewoud Kohl van Wijngaarden <[email protected]> Co-authored-by: pkranenburg <[email protected]>
theforeman · Jan 10, 2022 · bb6e115 · bb6e115
1 parent 2f60b88
commit bb6e115
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/manifests/repo.pp b/manifests/repo.pp
@@ -35,8 +35,8 @@
     }
 
     if $facts['os']['release']['major'] == '8' and ($repo == 'nightly' or versioncmp($repo, '2.5') >= 0) {
-      package { 'ruby:2.7':
-        ensure      => installed,
+      package { 'ruby':
+        ensure      => '2.7',
         enable_only => true,
         provider    => 'dnfmodule',
       }

diff --git a/spec/classes/foreman_repo_spec.rb b/spec/classes/foreman_repo_spec.rb
@@ -39,9 +39,9 @@
 
         it do
           if facts[:operatingsystemmajrelease] == '8'
-            is_expected.to contain_package('ruby:2.7')
+            is_expected.to contain_package('ruby').with_ensure('2.7').with_provider('dnfmodule')
           else
-            is_expected.not_to contain_package('ruby:2.7')
+            is_expected.not_to contain_package('ruby')
           end
         end
       end
@@ -67,7 +67,7 @@
         it { is_expected.not_to contain_package('centos-release-scl-rh') }
 
         it do
-          is_expected.not_to contain_package('ruby:2.7')
+          is_expected.not_to contain_package('ruby')
         end
       end
 
@@ -83,9 +83,9 @@
 
         it do
           if facts[:operatingsystemmajrelease] == '8'
-            is_expected.to contain_package('ruby:2.7')
+            is_expected.to contain_package('ruby').with_ensure('2.7').with_provider('dnfmodule')
           else
-            is_expected.not_to contain_package('ruby:2.7')
+            is_expected.not_to contain_package('ruby')
           end
         end
       end