Merge pull request #401 from bastelfreak/issue_351

peadm::install: Depend code-manager setup on r10k remote presence, not r10k ssh key
puppetlabs · Oct 30, 2023 · c673e58 · c673e58
2 parents f212c47 + 6a82476
commit c673e58
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/plans/subplans/install.pp b/plans/subplans/install.pp
@@ -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