Skip to content

Commit 41e280e

Browse files
dkruceschucklever
authored andcommitted
Makefile: terraform wasn't building the kdevops_nodes file
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: 5457b74 ("Makefile: fix target dependency order") Signed-off-by: Daniel Gomez <[email protected]>
1 parent 0441781 commit 41e280e

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,16 +144,16 @@ endif
144144
DEFAULT_DEPS += $(ANSIBLE_CFG_FILE)
145145
DEFAULT_DEPS += $(ANSIBLE_INVENTORY_FILE)
146146

147-
ifneq (,$(KDEVOPS_NODES))
148-
DEFAULT_DEPS += $(KDEVOPS_NODES)
149-
endif
150-
151147
include scripts/provision.Makefile
152148
include scripts/firstconfig.Makefile
153149
include scripts/systemd-timesync.Makefile
154150
include scripts/journal-server.Makefile
155151
include scripts/update_etc_hosts.Makefile
156152

153+
ifneq (,$(KDEVOPS_NODES))
154+
DEFAULT_DEPS += $(KDEVOPS_NODES)
155+
endif
156+
157157
KDEVOPS_BRING_UP_DEPS += $(KDEVOPS_BRING_UP_DEPS_EARLY)
158158
KDEVOPS_BRING_UP_DEPS += $(KDEVOPS_PROVISIONED_DEVCONFIG)
159159

0 commit comments

Comments
 (0)