-
Notifications
You must be signed in to change notification settings - Fork 241
Add OpenVox support #935
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
Add OpenVox support #935
Conversation
|
This is a resubmission of #933. I pasically added |
76dc42e to
b43a016
Compare
a7a6572 to
b207a35
Compare
|
ah yeah, we didn't backport that to 7.x. We probably should. Lemme chat with the team. |
|
EDIT: found it! So I just installed this module and it's active, and I applied the https://github.com/theforeman/puppet-puppet/pull/935.diff for this PR and now I can install openvox with: if $facts['networking']['hostname'] == 'labrat' {
class {
'puppet':
runmode => 'cron',
client_package => 'openvox-agent',
agent_server_hostname => 'theforeman.example.com',
}
}Although it doesn't set up the repo yet. |
|
I think it's also required that |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we make it reflect that OpenVox introduced an implementation fact?
|
@bastelfreak Any plans to continue this? (looks like there are conflicts as #936 was already merged) |
de0091a to
629ed30
Compare
629ed30 to
186387d
Compare
|
@bastelfreak The failling tests are not related to this change. Am I right? What do we need to merge this then? How can we help? |
186387d to
0d9ed0b
Compare
|
3d4624e to
b458215
Compare
a004b16 to
887a26e
Compare
| # We need a method to determine what version is installed. | ||
| $real_puppetserver_version = pick($puppetserver_version, '8.0.0') | ||
|
|
||
| $puppetserver_package = pick($puppet::server::package, 'puppetserver') |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It seems like the variable isn't used anywhere
3720cd8 to
678be11
Compare
manifests/params.pp
Outdated
| if ($facts['os']['family'] =~ /(FreeBSD|DragonFly)/) { | ||
| $server_package = "puppetserver${puppet_major}" | ||
| # Add support for OpenVox. Default to puppet if nothing is installed yet | ||
| $puppet_flavor = pick($facts['implementation'], 'puppet') |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
wonder if these vars should use implementation instead of flavor given that the fact is also implementation
not going to block on this
678be11 to
8954eb9
Compare
This adds a fact that discovers if the Perforce or OpenVox agent is installed. If none are installed yet, we default to the Perforce package for backwards compatibility.
8954eb9 to
771983d
Compare
|
@ekohl as you had requested changes, I'll leave the final merge to you |
The tooling already supports acceptance testing with OpenVox. Just a few gems need to be updated. newer puppet_metadata generates OpenVox jobs for git GitHub matrix, voxpupuli-acceptance pulls in a newer beaker version. By applying this, OpenVox beaker jobs are still opt-in. OpenVox has to be added as a requirement to each metadata.json. **This won't switch the unit testing from puppet to openvox** Tested at theforeman/puppet-puppet#935
|
@ekohl can we finish this? |
|
🥳 |
This results from changes in theforeman/puppet-puppet#935 Signed-off-by: Eric D. Helms <[email protected]>
This results from changes in theforeman/puppet-puppet#935 Signed-off-by: Eric D. Helms <[email protected]>
This results from changes in theforeman/puppet-puppet#935 Signed-off-by: Eric D. Helms <[email protected]>
This results from changes in theforeman/puppet-puppet#935 Signed-off-by: Eric D. Helms <[email protected]>
This results from changes in theforeman/puppet-puppet#935 Signed-off-by: Eric D. Helms <[email protected]>

This adds a fact that discovers if the Perforce or OpenVox agent is installed. If none are installed yet, we default to the Perforce package for backwards compatibility.