aboutsummaryrefslogtreecommitdiff
path: root/terraform
diff options
context:
space:
mode:
authorChristopher Baines <mail@cbaines.net>2018-07-04 11:28:34 +0100
committerChristopher Baines <mail@cbaines.net>2018-07-04 11:28:34 +0100
commitbb790668bf4c2c0de0876480dbf2d11903f22ba5 (patch)
tree3cff3d70f3c7c40a59b9fb48abf36121f5383fa2 /terraform
parent9af8bba490c3390a447e95da381c981ca60c80cb (diff)
downloadgovuk-mini-environment-admin-bb790668bf4c2c0de0876480dbf2d11903f22ba5.tar
govuk-mini-environment-admin-bb790668bf4c2c0de0876480dbf2d11903f22ba5.tar.gz
Pass the terraform credentials to the remote state configuration
This fixes the mini environment Terraform working, now that the backend is protected by basic authentication.
Diffstat (limited to 'terraform')
-rw-r--r--terraform/aws/mini_environment/main.tf10
-rw-r--r--terraform/libvirt/mini_environment/main.tf10
2 files changed, 20 insertions, 0 deletions
diff --git a/terraform/aws/mini_environment/main.tf b/terraform/aws/mini_environment/main.tf
index a0d066a..7f2ebf6 100644
--- a/terraform/aws/mini_environment/main.tf
+++ b/terraform/aws/mini_environment/main.tf
@@ -30,6 +30,14 @@ variable "backend_remote_state_address" {
type = "string"
}
+variable "backend_remote_state_username" {
+ type = "string"
+}
+
+variable "backend_remote_state_password" {
+ type = "string"
+}
+
variable "ssh_private_key" {
type = "string"
}
@@ -45,6 +53,8 @@ data "terraform_remote_state" "backend" {
backend = "http"
config {
address = "${var.backend_remote_state_address}"
+ username = "${var.backend_remote_state_username}"
+ password = "${var.backend_remote_state_password}"
}
}
diff --git a/terraform/libvirt/mini_environment/main.tf b/terraform/libvirt/mini_environment/main.tf
index 504574c..f572df6 100644
--- a/terraform/libvirt/mini_environment/main.tf
+++ b/terraform/libvirt/mini_environment/main.tf
@@ -2,6 +2,14 @@ variable "backend_remote_state_address" {
type = "string"
}
+variable "backend_remote_state_username" {
+ type = "string"
+}
+
+variable "backend_remote_state_password" {
+ type = "string"
+}
+
variable "machine_name" {
type = "string"
}
@@ -30,6 +38,8 @@ data "terraform_remote_state" "backend" {
backend = "http"
config {
address = "${var.backend_remote_state_address}"
+ username = "${var.backend_remote_state_username}"
+ password = "${var.backend_remote_state_password}"
}
}