Skip to content

Commit bb6e115

Browse files
bastelfreakekohlpkranenburg
authored
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]>
1 parent 2f60b88 commit bb6e115

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

manifests/repo.pp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
}
3636

3737
if $facts['os']['release']['major'] == '8' and ($repo == 'nightly' or versioncmp($repo, '2.5') >= 0) {
38-
package { 'ruby:2.7':
39-
ensure => installed,
38+
package { 'ruby':
39+
ensure => '2.7',
4040
enable_only => true,
4141
provider => 'dnfmodule',
4242
}

spec/classes/foreman_repo_spec.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@
3939

4040
it do
4141
if facts[:operatingsystemmajrelease] == '8'
42-
is_expected.to contain_package('ruby:2.7')
42+
is_expected.to contain_package('ruby').with_ensure('2.7').with_provider('dnfmodule')
4343
else
44-
is_expected.not_to contain_package('ruby:2.7')
44+
is_expected.not_to contain_package('ruby')
4545
end
4646
end
4747
end
@@ -67,7 +67,7 @@
6767
it { is_expected.not_to contain_package('centos-release-scl-rh') }
6868

6969
it do
70-
is_expected.not_to contain_package('ruby:2.7')
70+
is_expected.not_to contain_package('ruby')
7171
end
7272
end
7373

@@ -83,9 +83,9 @@
8383

8484
it do
8585
if facts[:operatingsystemmajrelease] == '8'
86-
is_expected.to contain_package('ruby:2.7')
86+
is_expected.to contain_package('ruby').with_ensure('2.7').with_provider('dnfmodule')
8787
else
88-
is_expected.not_to contain_package('ruby:2.7')
88+
is_expected.not_to contain_package('ruby')
8989
end
9090
end
9191
end

0 commit comments

Comments
 (0)