clan-cli/vms/run: generate secret before inspect_vm
inspect_vm does some caching, which lead to secrets not beeing found.
This commit is contained in:
@@ -82,11 +82,9 @@ def get_secrets(
|
|||||||
secrets_dir = tmpdir / "secrets"
|
secrets_dir = tmpdir / "secrets"
|
||||||
secrets_dir.mkdir(parents=True, exist_ok=True)
|
secrets_dir.mkdir(parents=True, exist_ok=True)
|
||||||
|
|
||||||
generate_facts([machine])
|
|
||||||
run_generators([machine])
|
|
||||||
|
|
||||||
machine.secret_facts_store.upload(secrets_dir)
|
machine.secret_facts_store.upload(secrets_dir)
|
||||||
populate_secret_vars(machine, secrets_dir)
|
populate_secret_vars(machine, secrets_dir)
|
||||||
|
|
||||||
return secrets_dir
|
return secrets_dir
|
||||||
|
|
||||||
|
|
||||||
@@ -384,6 +382,9 @@ def run_command(
|
|||||||
) -> None:
|
) -> None:
|
||||||
machine_obj: Machine = Machine(args.machine, args.flake)
|
machine_obj: Machine = Machine(args.machine, args.flake)
|
||||||
|
|
||||||
|
generate_facts([machine_obj])
|
||||||
|
run_generators([machine_obj])
|
||||||
|
|
||||||
vm: VmConfig = inspect_vm(machine=machine_obj)
|
vm: VmConfig = inspect_vm(machine=machine_obj)
|
||||||
|
|
||||||
if not os.environ.get("WAYLAND_DISPLAY"):
|
if not os.environ.get("WAYLAND_DISPLAY"):
|
||||||
|
|||||||
Reference in New Issue
Block a user