[PATCH] Makefile: terraform wasn't building the kdevops_nodes file
Chuck Lever <[email protected]> Thu, 2 Oct 2025 16:13:38 -0400
| Newsgroups | dev.linux.lists.kdevops |
|---|---|
| Message-ID | <[email protected]> |
From: Daniel Gomez <[email protected]> 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 <[email protected]> --- 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