From 6a824764210b31040c06000080394a40c06dd1f9 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Fri, 27 Oct 2023 10:10:45 +0200 Subject: [PATCH] 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 --- plans/subplans/install.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plans/subplans/install.pp b/plans/subplans/install.pp index e702de89..0ecbd6bf 100644 --- 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