Skip to content

Commit c0857e5

Browse files
author
Johan De Wit
committed
Reset globals version back to undef, set default repo version to 6.0
1 parent aebdfb4 commit c0857e5

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

manifests/globals.pp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
$ipv6 = undef,
132132
$bind_ip = undef,
133133

134-
$version = '6.0',
134+
$version = undef,
135135
$mongosh_version = undef,
136136
$manage_package_repo = fact('os.distro.codename') ? { # Debian 10 doesn't provide mongodb packages. So manage it!
137137
'buster' => true,
@@ -162,7 +162,7 @@
162162
if $manage_package_repo != false {
163163
class { 'mongodb::repo':
164164
ensure => present,
165-
version => $version,
165+
version => pick($version, '6.0'),
166166
use_enterprise_repo => $use_enterprise_repo,
167167
repo_location => $repo_location,
168168
proxy => $repo_proxy,
@@ -178,7 +178,7 @@
178178

179179
class { 'mongodb::repo':
180180
ensure => present,
181-
version => $version,
181+
version => pick($version, '6.0'),
182182
use_enterprise_repo => $use_enterprise_repo,
183183
repo_location => $repo_location,
184184
proxy => $repo_proxy,

spec/classes/mongos_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
# install
2727
it { is_expected.to contain_class('mongodb::mongos::install') }
2828

29-
it { is_expected.to contain_package('mongodb_mongos').with_ensure('6.0').with_name(package_name).with_tag('mongodb_package') }
29+
it { is_expected.to contain_package('mongodb_mongos').with_ensure('present').with_name(package_name).with_tag('mongodb_package') }
3030

3131
# config
3232
it { is_expected.to contain_class('mongodb::mongos::config') }
@@ -87,7 +87,7 @@
8787

8888
it { is_expected.to compile.with_all_deps }
8989

90-
it { is_expected.to contain_package('mongodb_mongos').with_name('mongo-foo').with_ensure('6.0').with_tag('mongodb_package') }
90+
it { is_expected.to contain_package('mongodb_mongos').with_name('mongo-foo').with_ensure('present').with_tag('mongodb_package') }
9191
end
9292

9393
context 'service_manage => false' do

spec/classes/server_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@
4747
it_behaves_like 'server classes'
4848

4949
if facts[:os]['family'] == 'RedHat' || facts[:os]['family'] == 'Suse' || facts[:os]['release']['major'] =~ %r{(10)}
50-
it { is_expected.to contain_package('mongodb_server').with_ensure('6.0').with_name('mongodb-org-server').with_tag('mongodb_package') }
50+
it { is_expected.to contain_package('mongodb_server').with_ensure('present').with_name('mongodb-org-server').with_tag('mongodb_package') }
5151
else
52-
it { is_expected.to contain_package('mongodb_server').with_ensure('6.0').with_name('mongodb-server').with_tag('mongodb_package') }
52+
it { is_expected.to contain_package('mongodb_server').with_ensure('present').with_name('mongodb-server').with_tag('mongodb_package') }
5353
end
5454

5555
it do

0 commit comments

Comments
 (0)