Skip to content

Commit 6a82476

Browse files
committed
peadm::install: Depend code-manager setup on r10k remote presence, not 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
1 parent f212c47 commit 6a82476

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

plans/subplans/install.pp

+2-2
Original file line numberDiff line numberDiff line change
@@ -136,10 +136,10 @@
136136
$r10k_private_key = peadm::file_or_content('r10k_private_key', $r10k_private_key_file, $r10k_private_key_content)
137137

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

0 commit comments

Comments
 (0)