Merge branch 'master' into add_smtp

astronomer · Jul 2, 2019 · 02f4515 · 02f4515
2 parents b686ed9 + 9a293d3
commit 02f4515
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/astronomer.tf b/astronomer.tf
@@ -13,6 +13,10 @@ resource "null_resource" "helm_repo" {
     when    = "destroy"
     command = "rm -rf './helm.astronomer.io'"
   }
+
+  triggers = {
+    astronomer_version = var.astronomer_version
+  }
 }
 
 # this is for development use

diff --git a/locals.tf b/locals.tf
@@ -39,11 +39,14 @@ nginx:
 astronomer:
   houston:
     config:
+<<<<<<< HEAD
     %{if var.smtp_uri != ""}
         email:
           enabled: true
           smtpUrl: ${var.smtp_uri}
     %{endif}
+=======
+>>>>>>> master
         helm:
            affinity:
              nodeAffinity: