Merge pull request #100 from canonical/minor-terraform-module-stuff

Minor terraform module stuff

terraform/testflinger.tf → terraform/main.tf

@@ -1,38 +1,3 @@
-terraform {
-  required_providers {
-    juju = {
-      version = "~> 0.7.0"
-      source  = "juju/juju"
-    }
-  }
-}
-
-provider "juju" {}
-
-
-variable "environment" {
-  description = "The environment to deploy to (dev, staging, prod)"
-}
-
-variable "external_ingress_hostname" {
-  description = "External hostname for the ingress"
-  type        = string
-}
-
-variable "tls_secret_name" {
-  description = "Secret where the TLS certificate for ingress is stored"
-  type        = string
-}
-
-variable "db_offer" {
-  description = "Name of the juju offer for mongodb to use for the cross-model relation"
-  type        = string
-}
-
-locals {
-  app_model = "testflinger-${var.environment}"
-}
-
 resource "juju_application" "testflinger" {
   name  = "testflinger"
   model = local.app_model

terraform/variables.tf

@@ -0,0 +1,22 @@
+variable "environment" {
+  description = "The environment to deploy to (dev, staging, prod)"
+}
+
+variable "external_ingress_hostname" {
+  description = "External hostname for the ingress"
+  type        = string
+}
+
+variable "tls_secret_name" {
+  description = "Secret where the TLS certificate for ingress is stored"
+  type        = string
+}
+
+variable "db_offer" {
+  description = "Name of the juju offer for mongodb to use for the cross-model relation"
+  type        = string
+}
+
+locals {
+  app_model = "testflinger-${var.environment}"
+}

terraform/versions.tf

@@ -0,0 +1,8 @@
+terraform {
+  required_providers {
+    juju = {
+      version = "~> 0.7.0"
+      source  = "juju/juju"
+    }
+  }
+}