chore: upgrade terragrunt/tofu
- fix makefile to work with opentofu and terragrunt 0.90.0 - cleanup comments - rename template/base/terragrunt.hcl
This commit is contained in:
parent
cc4e5248da
commit
4a298bde81
10
Makefile
10
Makefile
@ -10,7 +10,7 @@ define vault_env
|
|||||||
export PUPPET_CERT_CA=$$(vault kv get -field=public_key kv/service/puppet/certificates/ca) && \
|
export PUPPET_CERT_CA=$$(vault kv get -field=public_key kv/service/puppet/certificates/ca) && \
|
||||||
export PUPPET_CERT_PUB=$$(vault kv get -field=public_key kv/service/puppet/certificates/terraform) && \
|
export PUPPET_CERT_PUB=$$(vault kv get -field=public_key kv/service/puppet/certificates/terraform) && \
|
||||||
export PUPPET_CERT_PRIV=$$(vault kv get -field=private_key kv/service/puppet/certificates/terraform) && \
|
export PUPPET_CERT_PRIV=$$(vault kv get -field=private_key kv/service/puppet/certificates/terraform) && \
|
||||||
export TERRAGRUNT_EXCLUDE_DIR="templates/base" \
|
export TG_QUEUE_EXCLUDE_DIR="templates/base" && \
|
||||||
export $$(vault read -format=json kv/data/service/terraform/incus | jq -r '.data.data | to_entries[] | "\(.key)=\(.value)"')
|
export $$(vault read -format=json kv/data/service/terraform/incus | jq -r '.data.data | to_entries[] | "\(.key)=\(.value)"')
|
||||||
endef
|
endef
|
||||||
|
|
||||||
@ -23,20 +23,20 @@ clean:
|
|||||||
|
|
||||||
init:
|
init:
|
||||||
@$(call vault_env) && \
|
@$(call vault_env) && \
|
||||||
terragrunt run-all --terragrunt-non-interactive init --upgrade
|
terragrunt run --all --non-interactive init -- -upgrade
|
||||||
|
|
||||||
plan: init
|
plan: init
|
||||||
@$(call vault_env) && \
|
@$(call vault_env) && \
|
||||||
terragrunt run-all --terragrunt-parallelism 8 --terragrunt-non-interactive plan
|
terragrunt run --all --parallelism 8 --non-interactive plan
|
||||||
|
|
||||||
apply:
|
apply:
|
||||||
@$(call vault_env) && \
|
@$(call vault_env) && \
|
||||||
terragrunt run-all --terragrunt-parallelism 5 --terragrunt-non-interactive apply
|
terragrunt run --all --parallelism 5 --non-interactive apply
|
||||||
|
|
||||||
output:
|
output:
|
||||||
@$(call vault_env) && \
|
@$(call vault_env) && \
|
||||||
rm -f tf_outputs.json && \
|
rm -f tf_outputs.json && \
|
||||||
terragrunt run-all --terragrunt-parallelism 10 --terragrunt-non-interactive output -json >> tf_outputs.json
|
terragrunt run --all --parallelism 10 --non-interactive output -json >> tf_outputs.json
|
||||||
|
|
||||||
hiera:
|
hiera:
|
||||||
@echo "Setting up virtual environment with uv..."
|
@echo "Setting up virtual environment with uv..."
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
# special devices
|
|
||||||
gpu:
|
gpu:
|
||||||
description: "Pass-through Intel GPU"
|
description: "Pass-through Intel GPU"
|
||||||
project: null
|
project: null
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user