Skip to content

Commit 7e3ba69

Browse files
thaiphvalexjfisher
authored andcommitted
Fix a dependency cycle caused by Apt::Source from puppetlabs-apt 6.3.0 (#528)
Tag the package resources with `mongodb_package`
1 parent 5133782 commit 7e3ba69

File tree

8 files changed

+9
-8
lines changed

8 files changed

+9
-8
lines changed

manifests/client.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@
1414
package { 'mongodb_client':
1515
ensure => $ensure,
1616
name => $package_name,
17-
tag => 'mongodb',
17+
tag => 'mongodb_package',
1818
}
1919
}

manifests/mongos/install.pp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
package { 'mongodb_mongos':
99
ensure => $package_ensure,
1010
name => $package_name,
11+
tag => 'mongodb_package',
1112
}
1213
}
1314

manifests/repo/apt.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
},
1818
}
1919

20-
Apt::Source['mongodb']->Package<|tag == 'mongodb'|>
20+
Apt::Source['mongodb'] -> Package<| tag == 'mongodb_package' |>
2121
}
2222
else {
2323
apt::source { 'mongodb':

manifests/repo/yum.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
proxy_username => $mongodb::repo::proxy_username,
1414
proxy_password => $mongodb::repo::proxy_password,
1515
}
16-
Yumrepo['mongodb'] -> Package<|tag == 'mongodb'|>
16+
Yumrepo['mongodb'] -> Package<| tag == 'mongodb_package' |>
1717
}
1818
else {
1919
yumrepo { 'mongodb':

manifests/server/install.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@
2929
package { 'mongodb_server':
3030
ensure => $my_package_ensure,
3131
name => $package_name,
32-
tag => 'mongodb',
32+
tag => 'mongodb_package',
3333
}
3434
}

spec/classes/client_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
end
1717

1818
it { is_expected.to compile.with_all_deps }
19-
it { is_expected.to create_package('mongodb_client').with_ensure('present').with_name('mongodb-org-shell') }
19+
it { is_expected.to create_package('mongodb_client').with_ensure('present').with_name('mongodb-org-shell').with_tag('mongodb_package') }
2020
end
2121
end
2222
end

spec/classes/mongos_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
# install
2020
it { is_expected.to contain_class('mongodb::mongos::install') }
21-
it { is_expected.to contain_package('mongodb_mongos').with_ensure('present').with_name('mongodb-server') }
21+
it { is_expected.to contain_package('mongodb_mongos').with_ensure('present').with_name('mongodb-server').with_tag('mongodb_package') }
2222

2323
# config
2424
it { is_expected.to contain_class('mongodb::mongos::config') }
@@ -68,7 +68,7 @@
6868
end
6969

7070
it { is_expected.to compile.with_all_deps }
71-
it { is_expected.to contain_package('mongodb_mongos').with_name('mongo-foo') }
71+
it { is_expected.to contain_package('mongodb_mongos').with_name('mongo-foo').with_ensure('present').with_tag('mongodb_package') }
7272
end
7373

7474
context 'service_manage => false' do

spec/classes/server_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
describe 'with defaults' do
3838
it_behaves_like 'server classes'
3939

40-
it { is_expected.to contain_package('mongodb_server').with_ensure('present').with_name('mongodb-server') }
40+
it { is_expected.to contain_package('mongodb_server').with_ensure('present').with_name('mongodb-server').with_tag('mongodb_package') }
4141

4242
it do
4343
is_expected.to contain_file(config_file).

0 commit comments

Comments
 (0)