Skip to content

Commit

Permalink
Update deps to use puppet/systemd (#77)
Browse files Browse the repository at this point in the history
This patch updates from camptocamp/systemd 2.x to puppet/systemd 3.x

This bump is driven by simp/simp-core#829
  • Loading branch information
op-ct authored Jun 20, 2022
1 parent e313101 commit 6932768
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 8 deletions.
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,12 @@
.idea/
dist
/pkg
/spec/fixtures
# Read everything in fixtures
/spec/fixtures/*
# Un-ignore hieradata
!/spec/fixtures/hieradata/*
# Except this one, which is auto-generated
/spec/fixtures/hieradata/hiera.yaml
/spec/rp_env
/.rspec_system
/.vagrant
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
* Fri Jun 03 2022 Chris Tessmer <[email protected]> - 7.4.0
- Update from camptocamp/systemd to puppet/systemd

* Tue Jun 15 2021 Chris Tessmer <[email protected]> - 7.3.0
- Removed support for Puppet 5
- Ensured support for Puppet 7 in requirements and stdlib
Expand Down
3 changes: 1 addition & 2 deletions manifests/install.pp
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,10 @@
$_proc_gid = $facts.dig('simplib__mountpoints', '/proc', 'options_hash', 'gid')

if $_proc_gid {
simplib::assert_optional_dependency($module_name, 'camptocamp/systemd')
simplib::assert_optional_dependency($module_name, 'puppet/systemd')

systemd::dropin_file { "${module_name}_hidepid.conf":
unit => 'systemd-logind.service',
daemon_reload => 'eager',
notify => Exec['gdm_restart_logind'],
content => @("SYSTEMD_OVERRIDE")
[Service]
Expand Down
6 changes: 3 additions & 3 deletions metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "simp-gdm",
"version": "7.3.0",
"version": "7.4.0",
"author": "SIMP Team",
"summary": "manages GDM",
"license": "Apache-2.0",
Expand Down Expand Up @@ -38,8 +38,8 @@
"simp": {
"optional_dependencies": [
{
"name": "camptocamp/systemd",
"version_requirement": ">= 2.2.0 < 3.0.0"
"name": "puppet/systemd",
"version_requirement": ">= 3.10.0 < 4.0.0"
},
{
"name": "simp/pam",
Expand Down
1 change: 0 additions & 1 deletion spec/acceptance/suites/compliance/nodesets/default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ HOSTS:
CONFIG:
log_level: verbose
type: aio
vagrant_memsize: 256
<% if ENV['BEAKER_PUPPET_COLLECTION'] -%>
puppet_collection: <%= ENV['BEAKER_PUPPET_COLLECTION'] %>
<% end -%>
1 change: 0 additions & 1 deletion spec/classes/init_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@
end
it { is_expected.to create_systemd__dropin_file('gdm_hidepid.conf').with({
:unit => "systemd-logind.service",
:daemon_reload => 'eager',
:content => /SupplementaryGroups=231/
})
}
Expand Down

0 comments on commit 6932768

Please sign in to comment.