Skip to content

Manage more parameters extension - #141

Open
dvo-rak wants to merge 2 commits into
theforeman:masterfrom
dvo-rak:manage-more-parameters
Open

Manage more parameters extension#141
dvo-rak wants to merge 2 commits into
theforeman:masterfrom
dvo-rak:manage-more-parameters

Conversation

@dvo-rak

@dvo-rak dvo-rak commented Sep 14, 2023

Copy link
Copy Markdown

Extends #115

@dvo-rak dvo-rak mentioned this pull request Sep 14, 2023
Draft
ekohl
ekohl reviewed Sep 14, 2023
View reviewed changes

@ekohl ekohl left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks for picking this up.

Comment thread data/Debian.yaml Outdated
Comment thread data/RedHat.yaml Outdated
Comment thread templates/tftp.service-override.epp Outdated
Comment thread metadata.json Outdated
@ekohl

ekohl commented Sep 18, 2023

Copy link
Copy Markdown
Member

Would you mind rebasing instead of merging?

@dvo-rak
dvo-rak force-pushed the manage-more-parameters branch 3 times, most recently from dcbdc47 to c20b1ad Compare September 19, 2023 09:03
@dvo-rak

dvo-rak commented Sep 19, 2023

Copy link
Copy Markdown
Author

Would you mind rebasing instead of merging?

I fixed the mess I made in the commits and rebased.

@dvo-rak
dvo-rak force-pushed the manage-more-parameters branch from c20b1ad to 8030ed5 Compare September 19, 2023 09:11
ekohl
ekohl reviewed Sep 19, 2023
View reviewed changes

@ekohl ekohl left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Perhaps port listening in acceptance tests can be properly tested now that the service always runs.

Comment thread spec/acceptance/tftp_port_spec.rb Outdated
Comment thread spec/acceptance/tftp_port_spec.rb Outdated
@dvo-rak

dvo-rak commented Sep 21, 2023

Copy link
Copy Markdown
Author

Perhaps port listening in acceptance tests can be properly tested now that the service always runs.

Included in 64de477

@dvo-rak
dvo-rak force-pushed the manage-more-parameters branch from 64de477 to 5bb987f Compare October 3, 2023 09:24
@ekohl
ekohl force-pushed the manage-more-parameters branch from 4544fd7 to e9715f4 Compare February 13, 2024 17:35
@ekohl

ekohl commented Feb 13, 2024

Copy link
Copy Markdown
Member

I'm sorry we didn't get to work this out at cfgmgmtcamp, but I've taken the liberty to rebase your commits and force push it. Checking what CI says now.

@ekohl
ekohl force-pushed the manage-more-parameters branch from e9715f4 to 8ffb6e4 Compare February 13, 2024 19:43
@dvo-rak

dvo-rak commented Feb 13, 2024 •
edited
Loading

Copy link
Copy Markdown
Author

Hi, thanks for remembering! I was...too tired..after Mondays evening to produce any values.

We have to address one more thing that I realized while using the proposed changes.

For RHEL - the tftp.socket service is running all the time (as it should), but tftp.service deactivates itself after 15 minutes without receiving any reguests. If requests come it (tftp.socket) keeps the tftp.service running or starts it. If the tftp.service is exited, then Puppet starts the service and the whole cycle continues. We manage both services (and ensure=running) to be able to reliably reload the service when the config file of the service is changed.

Any tips how to solve this on the Puppet level, or should I look into the config of tftp.service if its possible to keep it running without the 15min "TTL" ?

@ekohl ekohl mentioned this pull request Aug 9, 2024
Open
@kenyon kenyon mentioned this pull request Nov 7, 2025
Open
genebean added a commit to genebean/puppet-tftp that referenced this pull request Mar 27, 2026
@genebean @bastelfreak
@kenyon @ekohl Antonin Dvorak
Switch Arch from socket to service, fixup other PR's stuff
72d6f12 
This includes
- making changes to allow CI to pass such as adjusting the fixtures and
  fixing both the spec tests and the acceptance tests
- sorting some code sections by OS in both CI files and puppet manifests
- fixing the service name in `templates/tftp.service-override.epp`
- creating `templates/tftp.socket-override.epp`
- creating `templates/tftpd-archlinux.epp`
- renaming the tftpd-hpa template used by Debian because they do
   things differently than other distros with regards to the config file
- creating `templates/tftpd.epp`
- normalizing formatting of data so that all strings are single quoted

Regarding switching ArchLinux from using a socket to the service
directly, this appears to be what all the docs for Arch assume you are
already doing and is the only way I found to configure Arch that passed
the acceptance tests.

Changes mostly originated from these PRs:
- theforeman#141
- theforeman#160

Co-authored-by: Tim Meusel <tim@bastelfreak.de>
Co-authored-by: Kenyon Ralph <kenyon@kenyonralph.com>
Co-authored-by: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Co-authored-by: Antonin Dvorak <antonin.dvorak@cern.ch>
genebean added a commit to genebean/puppet-tftp that referenced this pull request Mar 27, 2026
@genebean @bastelfreak
@kenyon @ekohl Antonin Dvorak
Switch Arch from socket to service, fixup other PR's stuff
6344f4b 
This includes
- making changes to allow CI to pass such as adjusting the fixtures and
  fixing both the spec tests and the acceptance tests
- sorting some code sections by OS in both CI files and puppet manifests
- fixing the service name in `templates/tftp.service-override.epp`
- creating `templates/tftp.socket-override.epp`
- creating `templates/tftpd-archlinux.epp`
- renaming the tftpd-hpa template used by Debian because they do
   things differently than other distros with regards to the config file
- creating `templates/tftpd.epp`
- normalizing formatting of data so that all strings are single quoted

Regarding switching ArchLinux from using a socket to the service
directly, this appears to be what all the docs for Arch assume you are
already doing and is the only way I found to configure Arch that passed
the acceptance tests.

Changes mostly originated from these PRs:
- theforeman#141
- theforeman#160

Co-authored-by: Tim Meusel <tim@bastelfreak.de>
Co-authored-by: Kenyon Ralph <kenyon@kenyonralph.com>
Co-authored-by: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Co-authored-by: Antonin Dvorak <antonin.dvorak@cern.ch>
@genebean genebean mentioned this pull request Mar 27, 2026
Merged
genebean added a commit to genebean/puppet-tftp that referenced this pull request Mar 27, 2026
@genebean @bastelfreak
@kenyon @ekohl Antonin Dvorak
Switch Arch from socket to service, fixup other PR's stuff
e5bf782 
This includes
- making changes to allow CI to pass such as adjusting the fixtures and
  fixing both the spec tests and the acceptance tests
- sorting some code sections by OS in both CI files and puppet manifests
- fixing the service name in `templates/tftp.service-override.epp`
- creating `templates/tftp.socket-override.epp`
- creating `templates/tftpd-archlinux.epp`
- renaming the tftpd-hpa template used by Debian because they do
   things differently than other distros with regards to the config file
- creating `templates/tftpd.epp`
- normalizing formatting of data so that all strings are single quoted
- removing usage of legacy facts in spec files

Regarding switching ArchLinux from using a socket to the service
directly, this appears to be what all the docs for Arch assume you are
already doing and is the only way I found to configure Arch that passed
the acceptance tests.

Changes mostly originated from these PRs:
- theforeman#141
- theforeman#160

Co-authored-by: Tim Meusel <tim@bastelfreak.de>
Co-authored-by: Kenyon Ralph <kenyon@kenyonralph.com>
Co-authored-by: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Co-authored-by: Antonin Dvorak <antonin.dvorak@cern.ch>
bastelfreak added a commit that referenced this pull request Apr 24, 2026
@genebean @ekohl
@kenyon @bastelfreak Antonin Dvorak
Switch Arch from socket to service, fixup other PR's stuff (#162)
51bd25c 
* More flexibility in configuration

* fixtures: update puppet-systemd URL to voxpupuli

* convert Debian options file template to EPP

* RedHat: add default tftp::options

* config: add unit tests for tftp::options

This also adjusts the name of the dropin file for RedHat, since
root-directory.conf didn't seem to make sense since this configures
more than just the tftpd root directory.

* init: don't allow empty strings for $username

Co-authored-by: Tim Meusel <tim@bastelfreak.de>

* init: don't allow empty strings for $options

Co-authored-by: Tim Meusel <tim@bastelfreak.de>

* tftpd-hpa.epp: add comment about Puppet management

* Switch Arch from socket to service, fixup other PR's stuff

This includes
- making changes to allow CI to pass such as adjusting the fixtures and
  fixing both the spec tests and the acceptance tests
- sorting some code sections by OS in both CI files and puppet manifests
- fixing the service name in `templates/tftp.service-override.epp`
- creating `templates/tftp.socket-override.epp`
- creating `templates/tftpd-archlinux.epp`
- renaming the tftpd-hpa template used by Debian because they do
   things differently than other distros with regards to the config file
- creating `templates/tftpd.epp`
- normalizing formatting of data so that all strings are single quoted
- removing usage of legacy facts in spec files

Regarding switching ArchLinux from using a socket to the service
directly, this appears to be what all the docs for Arch assume you are
already doing and is the only way I found to configure Arch that passed
the acceptance tests.

Changes mostly originated from these PRs:
- #141
- #160

Co-authored-by: Tim Meusel <tim@bastelfreak.de>
Co-authored-by: Kenyon Ralph <kenyon@kenyonralph.com>
Co-authored-by: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Co-authored-by: Antonin Dvorak <antonin.dvorak@cern.ch>

---------

Co-authored-by: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Co-authored-by: Kenyon Ralph <kenyon@kenyonralph.com>
Co-authored-by: Tim Meusel <tim@bastelfreak.de>
Co-authored-by: Antonin Dvorak <antonin.dvorak@cern.ch>
@genebean

genebean commented Apr 30, 2026

Copy link
Copy Markdown
Contributor

FWIW, portions of this were merged in via #162

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

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@dvo-rak @ekohl @genebean @theforeman-bot