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.

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

Fixes #37877 - Make the config file compatible with 0.2.z and 0.4.z #10340

Merged
merged 1 commit into from
Oct 31, 2024

Conversation

adamruzicka
Copy link
Contributor

@adamruzicka adamruzicka commented Oct 3, 2024

  • broker is an array of mqtt servers used by 0.2
  • server is an array of mqtt servers used by 0.4
  • data-host needs to be set to an empty string to override certain compile-time defaults set in RHEL and CentOS Stream
  • prefix needs to be set to the value we expect to override certain compile-time defaults set in RHEL and CentOS Stream

broker and server can be set at both once, each will be honored by their respective versions

data-host and prefix can be set both at once on our build of yggdrasil they'll just duplicate the defaults, on RHEL/CentOS Stream they'll act as overrides

TODOs:

  • things in packaging

Copy link
Contributor

@pondrejk pondrejk left a comment

Choose a reason for hiding this comment

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

ack from the functional side, tested together with theforeman/katello-pull-transport-migrate#8

if which yggdrasil >/dev/null 2>/dev/null; then
yggdrasil status
else
systemctl status $YGGDRASIL_SERVICE
Copy link
Contributor

Choose a reason for hiding this comment

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

the registration process will stop on this line as the systemctl status will occupy the shell, I think something like systemctl status $YGGDRASIL_SERVICE --no-pager should do it

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Or we could just not do it at all? I'd say it is just eyecandy, we still check if the service is active a couple of lines lower

Copy link
Contributor

Choose a reason for hiding this comment

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

fine with me :)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Dropped

The service name changed between the package we shipped and official 0.4.z builds, these changes account for this discrepancy.

Config file changes:
- broker is an array of mqtt servers used by 0.2
- server is an array of mqtt servers used by 0.4
- data-host needs to be set to an empty string to override certain compile-time
  defaults set in RHEL and CentOS Stream
- path-prefix needs to be set to the value we expect to override certain compile-time
  defaults set in RHEL and CentOS Stream

broker and server can be set at both once, each will be honored by their
respective versions

data-host and path-prefix can be set both at once on our build of yggdrasil they'll
just duplicate the defaults, on RHEL/CentOS Stream they'll act as overrides
Copy link
Member

@ofedoren ofedoren left a comment

Choose a reason for hiding this comment

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

Thanks, @adamruzicka and @pondrejk !

@ofedoren ofedoren merged commit 7b14f55 into theforeman:develop Oct 31, 2024
52 checks passed
@adamruzicka adamruzicka deleted the ygg-compat branch October 31, 2024 14:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants