aboutsummaryrefslogtreecommitdiffstats
path: root/terraform-ci-infra
diff options
context:
space:
mode:
authorpmikus <pmikus@cisco.com>2021-01-29 13:12:43 +0000
committerPeter Mikus <pmikus@cisco.com>2021-01-29 13:52:18 +0000
commit6b4b75acf819a8a7c68d0f57365bbd6e0b4d3933 (patch)
tree6a3167b69112f1d552721ddd189031751c5caf3a /terraform-ci-infra
parent3715b48d91e15d0f961963acb641abce67a101d1 (diff)
Fix: Slack API key
- Clearly we must implement key storage vault to avoid storing key in .tfstate Signed-off-by: pmikus <pmikus@cisco.com> Change-Id: Iea2db10e4cd59c29a0c74ee92cbddc7d261bd6a7 (cherry picked from commit 101d3251d3f30f894a9143f8c1062761f3ed8337)
Diffstat (limited to 'terraform-ci-infra')
-rw-r--r--terraform-ci-infra/1n_nmd/main.tf7
1 files changed, 2 insertions, 5 deletions
diff --git a/terraform-ci-infra/1n_nmd/main.tf b/terraform-ci-infra/1n_nmd/main.tf
index d14603b771..fdf3801a35 100644
--- a/terraform-ci-infra/1n_nmd/main.tf
+++ b/terraform-ci-infra/1n_nmd/main.tf
@@ -1,5 +1,3 @@
-<<<<<<< HEAD (dae934 Infra: Remove Consul TLS on clients (Nomad conflict))
-=======
# For convenience in simple configurations, a child module automatically
# inherits default (un-aliased) provider configurations from its parent.
# This means that explicit provider blocks appear only in the root module,
@@ -30,7 +28,7 @@ module "alertmanager" {
alertmanager_cpu = 1000
alertmanager_mem = 1024
alertmanager_port = 9093
- alertmanager_slack_api_key = "TE07RD1V1/B01L7PQK9S8/xncEcMAvF0GtJpTbC30E0AyL"
+ alertmanager_slack_api_key = "TE07RD1V1/B01L7PQK9S8/pbADGhhhj60JSxHRi3K0NoW6"
alertmanager_slack_channel = "fdio-infra-monitoring"
}
@@ -184,5 +182,4 @@ module "vpp_device" {
csit_shim_group_count = "1"
csit_shim_cpu = "1000"
csit_shim_mem = "5000"
-}
->>>>>>> CHANGE (a44eef Infra: Monitoring capability)
+} \ No newline at end of file