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 #24012 - Add PuppetCA providers settings #433

Merged
merged 1 commit into from
Aug 29, 2018

Conversation

juliantodt
Copy link
Member

As we are adding new providers to the PuppetCa SmartProxy module, we need to add its settings-file to the puppet module and add the settings as params to have them configurable.

See SmartProxy-Refactor and new TokenWhitelistingProvider (to be pull-requested after refactor gets merged).

Waiting for both of the SmartProxy-PRs to get merged before removing WIP-status.

@@ -328,7 +334,10 @@
Stdlib::Absolutepath $puppetdir = $::foreman_proxy::params::puppetdir,
String $puppetca_cmd = $::foreman_proxy::params::puppetca_cmd,
String $puppet_group = $::foreman_proxy::params::puppet_group,
Enum['puppetca_hostname_whitelisting', 'puppetca_token_whitelisting'] $puppetca_provider = $::foreman_proxy::params::puppetca_provider,
Copy link
Member

Choose a reason for hiding this comment

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

For other providers we've decided against an enum because we never know which plugins could be added. While unlikely, I would like users to be able to add their own providers. It would also be consistent with other $*_provider parameters.

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.

This will also need a switch to stay compatible with current releases.

@juliantodt
Copy link
Member Author

Rebased on top of #435 which includes @ekohl's suggestions.

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.

Code looks good. This depends on theforeman/smart-proxy#592 and we also need a changing in packaging to handle the /var/lib/foreman-proxy/tokens.yaml.

@juliantodt juliantodt force-pushed the 24012_puppetcasettings branch from 270fb4f to 3149d56 Compare July 5, 2018 10:54
@juliantodt
Copy link
Member Author

Updated this to contain the new settings we added in theforeman/smart-proxy#592 puppetca_token_ttl and puppetca_certificate.

@juliantodt juliantodt changed the title [WIP] Fixes #24012 - Add PuppetCA providers settings Fixes #24012 - Add PuppetCA providers settings Jul 5, 2018
Copy link
Member

@timogoebel timogoebel left a comment

Choose a reason for hiding this comment

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

Looks good to me.

@timogoebel
Copy link
Member

@ekohl: I think this is ready to merge? Anything to add? Then we can merge the smart-proxy 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.

Pending other merges

@timogoebel
Copy link
Member

The smart-proxy PR has just been merged.

@mmoll mmoll merged commit 2677d2e into theforeman:master Aug 29, 2018
@mmoll
Copy link
Contributor

mmoll commented Aug 29, 2018

merged, danke @juliantodt!

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.

5 participants