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

Fixes #30950 - Enable SmartProxy Registration module #619

Merged
merged 1 commit into from
Oct 26, 2020
Merged

Fixes #30950 - Enable SmartProxy Registration module #619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Part of the Foreman installer: <https://github.com/theforeman/foreman-installer>
| Module version | Proxy versions | Notes |
|----------------|----------------|-----------------------------------------------------|
| 16.x | 2.3 and newer | See compatibility notes in its README for 2.0-2.2 |
| 13.x | 2.0 and newer | |
| 13.x | 2.0 - 2.2 | |
| 12.x | 1.19 - 1.24 | See compatibility notes in its README for 1.19-1.22 |
| 11.x | 1.19 - 1.23 | See compatibility notes in its README for 1.19-1.21 |
| 10.x | 1.19 - 1.21 | |
Expand All @@ -23,6 +23,7 @@ Part of the Foreman installer: <https://github.com/theforeman/foreman-installer>
| 2.x | 1.5 - 1.10 | |
| 1.x | 1.4 and older | |

16.x added support for Smart Proxy Registration feature, available in Smart Proxy 2.3 and newer.
12.x has dropped support for Puppet 3 which was officially unsupported for a while and Foreman Proxy 1.23 dropped altogether.

## Examples
Expand Down
2 changes: 2 additions & 0 deletions manifests/config.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@

contain foreman_proxy::module::logs

contain foreman_proxy::module::registration

if $foreman_proxy::puppetca or $foreman_proxy::puppet {
$uses_sudo = $foreman_proxy::puppetca and versioncmp($facts['puppetversion'], '6.0') < 0

Expand Down
6 changes: 6 additions & 0 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,10 @@
#
# $template_url:: URL a client should use for provisioning templates
#
# $registration:: Enable Registration feature
#
# $registration_listen_on:: Registration proxy to listen on https, http, or both
#
# $logs:: Enable Logs (log buffer) feature
#
# $logs_listen_on:: Logs proxy to listen on https, http, or both
Expand Down Expand Up @@ -327,6 +331,8 @@
Boolean $templates = $foreman_proxy::params::templates,
Foreman_proxy::ListenOn $templates_listen_on = $foreman_proxy::params::templates_listen_on,
Stdlib::HTTPUrl $template_url = $foreman_proxy::params::template_url,
Boolean $registration = $foreman_proxy::params::registration,
Foreman_proxy::ListenOn $registration_listen_on = $foreman_proxy::params::registration_listen_on,
stejskalleos marked this conversation as resolved.
Show resolved Hide resolved
Boolean $logs = $foreman_proxy::params::logs,
Foreman_proxy::ListenOn $logs_listen_on = $foreman_proxy::params::logs_listen_on,
Optional[Boolean] $httpboot = $foreman_proxy::params::httpboot,
Expand Down
17 changes: 17 additions & 0 deletions manifests/module/registration.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# @summary The built in Registration module
#
# @param enabled
# Whether the module is enabled or disabled.
#
# @param listen_on
# Where to listen on.
class foreman_proxy::module::registration (
Boolean $enabled = $foreman_proxy::registration,
Foreman_proxy::ListenOn $listen_on = $foreman_proxy::registration_listen_on,
stejskalleos marked this conversation as resolved.
Show resolved Hide resolved
) {
foreman_proxy::module { 'registration':
enabled => $enabled,
feature => 'Registration',
Copy link
Member

Choose a reason for hiding this comment

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

Note to self: confirmed that this matches Foreman's feature name (theforeman/foreman@31b0d19)

listen_on => $listen_on,
}
}
4 changes: 4 additions & 0 deletions manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,10 @@
$templates_listen_on = 'both'
$template_url = "http://${facts['networking']['fqdn']}:${http_port}"

# Registration settings
$registration = true
$registration_listen_on = 'https'

# Logs settings
$logs = true
$logs_listen_on = 'https'
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/foreman_proxy__register__spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
before { subject.resource('Datacat_collector[foreman_proxy::enabled_features]').provider.exists? }

it 'should populate features on foreman_smartproxy' do
expect(subject.resource("Foreman_smartproxy[#{facts[:fqdn]}]").parameters[:features].should.sort).to match_array(["Logs", "Puppet", "Puppet CA"])
expect(subject.resource("Foreman_smartproxy[#{facts[:fqdn]}]").parameters[:features].should.sort).to match_array(["Logs", "Puppet", "Puppet CA", "Registration"])
end
end
end
Expand Down
3 changes: 3 additions & 0 deletions templates/registration.yml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
# Enable Registration module
:enabled: <%= @module_enabled %>