Commit 96729881 authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

Merge branch 'fix-tf-http-address-override' into 'master' 

fix: lock state on TF_HTTP_ADDRESS location and not on default state

See merge request to-be-continuous/terraform!127
parents 2aa7c723 54400fc2

templates/gitlab-ci-terraform.yml

+2 −2
Original line number Diff line number Diff line
@@ -737,9 +737,9 @@ stages: 
      # Set variables for the HTTP backend to default to TF_* values

      # see: https://developer.hashicorp.com/terraform/language/settings/backends/http

      export TF_HTTP_ADDRESS="${TF_HTTP_ADDRESS:-${TF_ADDRESS}}"

      export TF_HTTP_LOCK_ADDRESS="${TF_HTTP_LOCK_ADDRESS:-${TF_ADDRESS}/lock}"

      export TF_HTTP_LOCK_ADDRESS="${TF_HTTP_LOCK_ADDRESS:-${TF_HTTP_ADDRESS}/lock}"

      export TF_HTTP_LOCK_METHOD="${TF_HTTP_LOCK_METHOD:-POST}"

      export TF_HTTP_UNLOCK_ADDRESS="${TF_HTTP_UNLOCK_ADDRESS:-${TF_ADDRESS}/lock}"

      export TF_HTTP_UNLOCK_ADDRESS="${TF_HTTP_UNLOCK_ADDRESS:-${TF_HTTP_ADDRESS}/lock}"

      export TF_HTTP_UNLOCK_METHOD="${TF_HTTP_UNLOCK_METHOD:-DELETE}"

      export TF_HTTP_USERNAME="${TF_HTTP_USERNAME:-${TF_USERNAME}}"

      export TF_HTTP_PASSWORD="${TF_HTTP_PASSWORD:-${TF_PASSWORD}}"