Skip to content

Commit

Permalink
peadm::install: Depend code-manager setup on r10k remote presence, no…
Browse files Browse the repository at this point in the history
…t r10k ssh key

We've logic in place that checks if the user provided an r10k remote key
and then automatically enable code-manager. This doesn't make sense
because the key is optional. We need to depend on a r10k URL. The URL
can be an absolute path to a local repo or an https url, both don't
require a remote key.

Fixes a bug I introcued in https://github.com/puppetlabs/puppetlabs-peadm/pull/352/files#r1373941616
  • Loading branch information
bastelfreak committed Oct 27, 2023
1 parent f212c47 commit 6a82476
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions plans/subplans/install.pp
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,10 @@
$r10k_private_key = peadm::file_or_content('r10k_private_key', $r10k_private_key_file, $r10k_private_key_content)

# enable code manager if:
# * it isn't explicitly disabled *and* the user provided r10k repo+key
# * it isn't explicitly disabled *and* the user provided r10k repo (key is optional, repo could be a local absolute path or https URL)
# * a replica is present
# * one or multiple compiler are present
$_code_manager_auto_configure = if $r10k_private_key and $code_manager_auto_configure {
$_code_manager_auto_configure = if $r10k_remote and $code_manager_auto_configure {
true
} elsif $replica_host {
true
Expand Down

0 comments on commit 6a82476

Please sign in to comment.