Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Compatibility with camptocamp/systemd 3.x #886

Merged
merged 2 commits into from
May 6, 2021
Merged

Compatibility with camptocamp/systemd 3.x #886

merged 2 commits into from
May 6, 2021

Conversation

TheMeier
Copy link
Contributor

@TheMeier TheMeier commented May 6, 2021 •
edited
Loading

Pull Request (PR) description

Remove systemd::systemctl::daemon_reload

This Pull Request (PR) fixes the following issues

Fails with puppet-systemd >= 3.0.0
See voxpupuli/puppet-systemd@2.12.0...3.0.0#diff-b335630551682c19a781afebcf4d07bf978fb1f8ac04c6bf87428ed5106870f5R224-R229
systemd::systemctl::daemon_reload was removed.

@ekohl

ekohl
ekohl requested changes May 6, 2021
View reviewed changes
Copy link
Member

@ekohl ekohl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The daemon reload is needed on Puppet < 6.1.0 which according to metadata.json is still supported. That means this patch will break those systems.

I think the best way is to change the conditional to if defined(Class['systemd::systemctl::daemon_reload']). Due to the inclusion of systemd::service_limits in rabbitmq::config it should be guaranteed to be loaded and the best way to support both camptocamp/systemd < 3 and >= 3.

Then it should also allow version 3.x in metadata.json.

call systemd::systemctl::daemon_reload only if it is defined
73d0694 
systemd::systemctl::daemon_reload was removed in camptocamp-systemd
3.0.0
@TheMeier
Copy link
Contributor Author

TheMeier commented May 6, 2021

The fainling test on puppet 7 debian 8 is not from the changes:

  --2021-05-06 09:44:54--  http://apt.puppet.com/puppet7-release-jessie.deb
  Resolving apt.puppet.com (apt.puppet.com)...   2600:9000:2191:8800:1d:fc37:1cc0:93a1, 2600:9000:2191:ac00:1d:fc37:1cc0:93a1, 2600:9000:2191:2e00:1d:fc37:1cc0:93a1, ...
  Connecting to apt.puppet.com (apt.puppet.com)|2600:9000:2191:8800:1d:fc37:1cc0:93a1|:80...   failed: Network is unreachable.```

@ekohl ekohl changed the title Remove systemd-releoad Remove systemd-reload May 6, 2021
@ekohl ekohl changed the title Remove systemd-reload Compatibility with camptocamp/systemd 3.x May 6, 2021
@ekohl
Copy link
Member

ekohl commented May 6, 2021

I think we can ignore that failure on merge. A separate PR to drop Debian 8 would be fine for me.

@TheMeier
Copy link
Contributor Author

TheMeier commented May 6, 2021

I think we can ignore that failure on merge. A separate PR to drop Debian 8 would be fine for me.

Ah right debian 8 is gone for some time already. I will prepare a PR

@ekohl
Copy link
Member

ekohl commented May 6, 2021

I don't use RabbitMQ myself, I just reasoned from my Puppet knowledge. I also made a suggestion for the current implementation so perhaps it's good if someone else also took a look. If nobody does and you can verify this solves your problem then I don't mind merging it myself.

@ekohl ekohl added the enhancement New feature or request label May 6, 2021
@bastelfreak bastelfreak mentioned this pull request May 6, 2021
Merged
@wyardley
Copy link
Contributor

wyardley commented May 6, 2021

If we’re already cutting a breaking release, what about doing #885?

@ekohl
Copy link
Member

ekohl commented May 6, 2021

I'd be ok with that.

@wyardley wyardley merged commit 0514e4a into voxpupuli:master May 6, 2021
@wyardley
Copy link
Contributor

wyardley commented May 6, 2021

May as well ship this one with 11.1.0 as well, and then merge #885 as part of the breaking release.

@wyardley wyardley mentioned this pull request May 6, 2021
Closed
wyardley added a commit to wyardley/puppet-rabbitmq that referenced this pull request May 6, 2021
@wyardley
Release 11.1.0
db9e42d 
- Add support for oom_score_adj (voxpupuli#877)
- CLI Environment Fixes (voxpupuli#876)
- make sure the rabbitmq_version method actually returns the version (voxpupuli#874)
- Use mocked facts in tests (voxpupuli#873)
- Enable Puppet 7 support (voxpupuli#881)
- Add auto cluster configuration support (voxpupuli#883)
- Compatibility with camptocamp/systemd 3.x (voxpupuli#886)
This was referenced May 6, 2021
Merged
Merged
wyardley added a commit to wyardley/puppet-rabbitmq that referenced this pull request May 6, 2021
@wyardley
Release 11.1.0
12e76e9 
- Add support for oom_score_adj (voxpupuli#877)
- CLI Environment Fixes (voxpupuli#876)
- make sure the rabbitmq_version method actually returns the version (voxpupuli#874)
- Use mocked facts in tests (voxpupuli#873)
- Enable Puppet 7 support (voxpupuli#881)
- Add auto cluster configuration support (voxpupuli#883)
- Compatibility with camptocamp/systemd 3.x (voxpupuli#886)
- puppetlabs/apt: Allow 8.x (voxpupuli#884)
- puppet/archive: Allow 5.x (voxpupuli#884)
- puppetlabs/stdlib: allow 7.x (voxpupuli#884)
nectar-gerrit pushed a commit to NeCTAR-RC/puppet-rabbitmq that referenced this pull request Sep 20, 2021
@TheMeier @onstring
Compatibility with camptocamp/systemd 3.x (voxpupuli#886)
095bca9 
* call systemd::systemctl::daemon_reload only if it is defined

systemd::systemctl::daemon_reload was removed in camptocamp-systemd
3.0.0

(Also change to use puppet systemd module)

(cherry picked from commit 0514e4a)
Change-Id: I33c75bbf8967d4461c0037215d2cacacf9b8788a
nectar-gerrit pushed a commit to NeCTAR-RC/puppet-rabbitmq that referenced this pull request Jun 7, 2022
@TheMeier
Compatibility with camptocamp/systemd 3.x (voxpupuli#886)
13a5334 
* call systemd::systemctl::daemon_reload only if it is defined

systemd::systemctl::daemon_reload was removed in camptocamp-systemd
3.0.0

(Also change to use puppet systemd module)

(cherry picked from commit 0514e4a)
Change-Id: I33c75bbf8967d4461c0037215d2cacacf9b8788a
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ekohl ekohl ekohl approved these changes

Assignees
No one assigned
Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@TheMeier @ekohl @wyardley