Skip to content

Commit 2d433aa

Browse files
authored
Update deps to use puppet/systemd (#17)
This patch updates from camptocamp/systemd 2.x to puppet/systemd 3.x Related: simp/simp-core#829
1 parent 19b021c commit 2d433aa

File tree

4 files changed

+14
-5
lines changed

4 files changed

+14
-5
lines changed

.gitignore

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,12 @@
99
.idea/
1010
dist
1111
/pkg
12-
/spec/fixtures
12+
# Read everything in fixtures
13+
/spec/fixtures/*
14+
# Un-ignore hieradata
15+
!/spec/fixtures/hieradata/*
16+
# Except this one, which is auto-generated
17+
/spec/fixtures/hieradata/hiera.yaml
1318
/spec/rp_env
1419
/.rspec_system
1520
/.vagrant

CHANGELOG

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
* Fri Jun 03 2022 Chris Tessmer <chris.tessmer@onyxpoint.com> - 0.2.0
2+
- Update from camptocamp/systemd to puppet/systemd
3+
14
* Wed Sep 22 2021 Trevor Vaughan <tvaughan@onyxpoint.com> - 0.1.2
25
- Ensure that the instances can load multiple CA certificates
36

metadata.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "simp-ds389",
3-
"version": "0.1.2",
3+
"version": "0.2.0",
44
"author": "SIMP Team",
55
"summary": "Management of 389 Directory Server",
66
"license": "Apache-2.0",
@@ -9,8 +9,8 @@
99
"issues_url": "https://simp-project.atlassian.net",
1010
"dependencies": [
1111
{
12-
"name": "camptocamp/systemd",
13-
"version_requirement": ">= 2.7.0 < 3.0.0"
12+
"name": "puppet/systemd",
13+
"version_requirement": ">= 3.0.0 < 4.0.0"
1414
},
1515
{
1616
"name": "simp/simplib",

spec/classes/install_spec.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717

1818
context "with #{os}" do
1919
it { is_expected.to compile.with_all_deps }
20-
it { is_expected.to contain_package('389-ds-base').with_ensure('present') }
20+
# Work around for https://github.com/puppetlabs/puppetlabs-stdlib/pull/1196
21+
it { is_expected.to contain_package('389-ds-base').with_ensure(/\A(present|installed)\Z/) }
2122
it { is_expected.not_to contain_package('389-admin') }
2223
it { is_expected.not_to contain_package('389-admin-console') }
2324
it { is_expected.not_to contain_package('389-ds-console') }

0 commit comments

Comments
 (0)