From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9C056202F70 for ; Thu, 2 Oct 2025 20:13:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759436020; cv=none; b=MfG0DjIduOT1eCh94IWguEtnjgaFvkAXxgoLhOXBDTD+N8I6Dgul2p2rbwnvn8fgj1qOGi/O6GCHhjiP4C/njJQMo4oOzlvyHAkALfuTvdJnbNRyevNOGbfUi5e+/pZPxXC63r/mywcm7SnWdpUPFLOFUAtbKtaZQmh6BefTPQs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759436020; c=relaxed/simple; bh=3fw1AEleCJVw7KxUGAAyQZhzHfDnOscP/mQxRryxMss=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=mH0nsLJ4NzjTGURPWdRCK/6ptvIrtwc+F40TDmaN9DensqYiwhfCJUxrzifxV4DgWtf6hPV2+9sCCrzqEC/cANTwZz8Gpc5jY5nlW9vSVaOQcUdlsEubvpMUCaGCHI0Bwy9AKYyV8UvGA0ItC5vwgU/d9pjQ8nG65+4n5FMcafk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=NHcTcFUc; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="NHcTcFUc" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 43F77C4CEF4; Thu, 2 Oct 2025 20:13:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1759436020; bh=3fw1AEleCJVw7KxUGAAyQZhzHfDnOscP/mQxRryxMss=; h=From:To:Cc:Subject:Date:From; b=NHcTcFUcb/g/Jf7til5dxTUgn92RTO+q1kztAO6J/NR4fc+nY7YgYFH69u/CUBpcf TkaX4kgqn+oo1VuBMngs9BWh6N6BC0XsDNPfMRfGLIPq0m2GagZtOplJDB1x334IXK ixjJbL7cikL+dIDKR+0H1an6OmGFwptsvwOZVdDai+Q32d6/gbaiiwmiURPsPS5dgw 3mlFLqAGPY8FBOV3RT+ujClTLmoEkmssya9Zu4p22cR5p6SVExK/jekkbce8Q/EuKA UCNA9Qj+kTNFGkfzkZJ74fVgEJ7rzc7TGsBMSDsBHDt0R4cN/AUqZvLITv749go1Al XAm80RtA/ESzw== From: Chuck Lever To: Daniel Gomez Cc: Subject: [PATCH] Makefile: terraform wasn't building the kdevops_nodes file Date: Thu, 2 Oct 2025 16:13:38 -0400 Message-ID: <20251002201338.3592784-1-cel@kernel.org> X-Mailer: git-send-email 2.51.0 Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Daniel Gomez When "make bringup" runs "terraform plan", it complains that the kdevops_nodes variable isn't set. extra_vars.yaml does contain the variable, but I'm guessing that somehow gen_nodes runs after gen_tfvars now? Not really sure. Daniel suggests: > I think it'd be best to move KDEVOPS_NODES just after we assign > the filename to it (provision.Makefile -> guestfs.Makefile): Fixes: 5457b742d611 ("Makefile: fix target dependency order") Signed-off-by: Daniel Gomez --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) Daniel, I've totally lost the plot. Is this patch adequate for fixing the "terraform plan" failures, or do you have something else in mind? diff --git a/Makefile b/Makefile index 9ea479c95a10..565f2b2bb4ee 100644 --- a/Makefile +++ b/Makefile @@ -144,16 +144,16 @@ endif DEFAULT_DEPS += $(ANSIBLE_CFG_FILE) DEFAULT_DEPS += $(ANSIBLE_INVENTORY_FILE) -ifneq (,$(KDEVOPS_NODES)) -DEFAULT_DEPS += $(KDEVOPS_NODES) -endif - include scripts/provision.Makefile include scripts/firstconfig.Makefile include scripts/systemd-timesync.Makefile include scripts/journal-server.Makefile include scripts/update_etc_hosts.Makefile +ifneq (,$(KDEVOPS_NODES)) +DEFAULT_DEPS += $(KDEVOPS_NODES) +endif + KDEVOPS_BRING_UP_DEPS += $(KDEVOPS_BRING_UP_DEPS_EARLY) KDEVOPS_BRING_UP_DEPS += $(KDEVOPS_PROVISIONED_DEVCONFIG) -- 2.51.0