Skip to content

Commit c673e58

Browse files
authored
Merge pull request #401 from bastelfreak/issue_351
peadm::install: Depend code-manager setup on r10k remote presence, not r10k ssh key
2 parents f212c47 + 6a82476 commit c673e58

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)