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

Refactor Puppet handling #662

Merged
merged 1 commit into from
Aug 22, 2018
Merged

Refactor Puppet handling #662

merged 1 commit into from
Aug 22, 2018

Conversation

ekohl
Copy link
Member

@ekohl ekohl commented Aug 15, 2018

This moves all puppetmaster defaults to its own parameters file.
Parameters that were used in both are duplicated. It also adds Puppet
types to all parameters.

This removes puppet settings from the top level. The puppet_ssldir is
now an internal detail to determine defaults. It is also no longer set
in Foreman since it's only used as a base for determining SSL paths
which we explicitly set. There is a PR open to remove this setting
altogether.

@mmoll
Copy link
Contributor

mmoll commented Aug 15, 2018

lint fails

@ekohl
Copy link
Member Author

ekohl commented Aug 15, 2018

Looks like I accidentally removed a bunch of code that would have broken otherwise. That was not intentional.

@mmoll
Copy link
Contributor

mmoll commented Aug 15, 2018

This should wait on theforeman/foreman#5588 I guess?

@ekohl
Copy link
Member Author

ekohl commented Aug 15, 2018

I'm not sure. While that variable is used by Foreman to determine defaults for other values, we don't really use the value because ssl certs are explicitly configured. That's why I'm slightly in doubt about it.

This moves all puppetmaster defaults to its own parameters file.
Parameters that were used in both are duplicated. It also adds Puppet
types to all parameters.

This removes puppet settings from the top level. The puppet_ssldir is
now an internal detail to determine defaults. It is also no longer set
in Foreman since it's only used as a base for determining SSL paths
which we explicitly set. There is a PR open to remove this setting
altogether.
@ekohl
Copy link
Member Author

ekohl commented Aug 22, 2018

@mmoll do you want to wait for the core merge or can we merge this now? IMHO both are ready to be merged now.

@mmoll mmoll merged commit c87d6d1 into theforeman:master Aug 22, 2018
@mmoll
Copy link
Contributor

mmoll commented Aug 22, 2018

merged, bedankt @ekohl!

@ekohl ekohl deleted the puppet-refactor branch August 22, 2018 14:54
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.

4 participants