Respect all files extracted from tar_file #461
Conversation
ekohl
force-pushed
the
add-test-for-certs-tar-with-server-certs
branch
from
729502a
to
57eabc3
Compare
ekohl
force-pushed
the
add-test-for-certs-tar-with-server-certs
branch
from
57eabc3
to
6ba3aee
Compare
|
This is growing to take a stab at fixing #456 but I'm not sure it's the right track. I suspect that all the various classes (apache, etc) will still attempt to generate a certificate. |
ekohl
force-pushed
the
add-test-for-certs-tar-with-server-certs
branch
from
6ba3aee
to
dc92400
Compare
|
@ehelms this is now green, but I'm a bit hesitant on touching such a core class. I wonder if passing |
ekohl
changed the title
|
This feels like a big regression and deserves a Redmine issue. It's one of our core workflows that we broke. |
|
See #463 for a more targeted approach that relies on the way this worked prior to the re-design. I have also included a Redmine issue with it. |
manifests/ca.pp
Outdated
| target => $server_ca_path, | ||
| require => File[$server_ca_path], | ||
| if $generate { | ||
| file { "${certs::ssl_build_dir}/KATELLO-TRUSTED-SSL-CERT": |
There was a problem hiding this comment.
Random note: I couldn't find a use for this anymore. I think we can drop it in a separate backwards-incompatible PR.
There was a problem hiding this comment.
Yes - to my knowledge as well this can be dropped.
This is reused a few times and makes it easier to follow what's related.
This always defined the same file, just with a different source. That source is either the provided server_ca_cert or the default CA.
This avoids writing out a password file that isn't needed.
ekohl
force-pushed
the
add-test-for-certs-tar-with-server-certs
branch
from
dc92400
to
86ee380
Compare
There was a problem hiding this comment.
Should the header be?
Boolean $generate = $certs::generate and !$certs::tar_file,Though I think it should be part of init.pp and reused in other places. Ideally we'd get rid of generate and regenerate altogether.
|
I split off the refactors without impact in #467. |
When passing in a tar file, it should respect all the files from that tar file and not overwrite them. I haven't done proper digging into when this exactly regressed yet.