Do not enable Puppet if there is no Pulp 2 #365
Conversation
ehelms
force-pushed
the
no-puppet-pulp2
branch
from
7035fbb
to
534d139
Compare
ehelms
force-pushed
the
no-puppet-pulp2
branch
from
534d139
to
a2dd546
Compare
manifests/params.pp
Outdated
| @@ -39,4 +39,10 @@ | |||
| String[1] $postgresql_evr_package = $katello::globals::postgresql_evr_package, | |||
| Boolean $pulp2_support = $katello::globals::pulp2_support, | |||
| ) inherits katello::globals { | |||
|
|
|||
There was a problem hiding this comment.
This empty line breaks CI once we update to the latest lint module. Please drop it.
There was a problem hiding this comment.
That still makes me sad :/ The empty line provides a nice break when reading the code.
ehelms
force-pushed
the
no-puppet-pulp2
branch
from
a2dd546
to
c84c03b
Compare
manifests/pulp.pp
Outdated
| @@ -146,7 +146,7 @@ | |||
| enable_rpm => $katello::params::enable_yum, | |||
| enable_iso => $katello::params::enable_file, | |||
| enable_deb => $katello::params::enable_deb, | |||
| enable_puppet => $katello::params::enable_puppet, | |||
| enable_puppet => $katello::params::_enable_puppet, | |||
There was a problem hiding this comment.
This part doesn't make a lot of sense. By definition we have Pulp 2 support at this point.
| enable_puppet => $katello::params::_enable_puppet, | |
| enable_puppet => $katello::params::enable_puppet, |
manifests/application.pp
Outdated
| @@ -50,7 +50,7 @@ | |||
| $enable_ostree = $katello::params::enable_ostree | |||
| $enable_yum = $katello::params::enable_yum | |||
| $enable_file = $katello::params::enable_file | |||
| $enable_puppet = $katello::params::enable_puppet | |||
| $enable_puppet = $katello::params::_enable_puppet | |||
There was a problem hiding this comment.
Thinking more about it, should we fix it here:
| $enable_puppet = $katello::params::_enable_puppet | |
| $enable_puppet = $katello::params::pulp2_support and $katello::params::enable_puppet |
That avoids the additional variable.
There was a problem hiding this comment.
Sure, I really had no idea, this module becoming really hard to follow after the re-factor to params/globals/application. Hopefully we can just drop all of that organization looking ahead.
There was a problem hiding this comment.
The long term goal I had was to stop using init.pp altogether. Then globals would be exposed in kafo as well as application and candlepin. params wouldn't be. theforeman/foreman-installer#421 would do that. I rebased it, but it needs migrations. However, what that allows us to do is to remove the pulp module from the answers file on EL8, which means you only have --pulp-* options on EL7. Due to different priorities I was never able to finish this work.
manifests/params.pp
Outdated
| @@ -39,4 +39,5 @@ | |||
| String[1] $postgresql_evr_package = $katello::globals::postgresql_evr_package, | |||
| Boolean $pulp2_support = $katello::globals::pulp2_support, | |||
| ) inherits katello::globals { | |||
| $_enable_puppet = $pulp2_support and $enable_puppet | |||
There was a problem hiding this comment.
If both other suggestions are accepted, this can be dropped
| $_enable_puppet = $pulp2_support and $enable_puppet |
ehelms
force-pushed
the
no-puppet-pulp2
branch
from
c84c03b
to
ade71c0
Compare
No description provided.