Infra: Move nginx service closer to storage

[csit.git] / terraform-ci-infra / 1n_nmd / main.tf

diff --git a/terraform-ci-infra/1n_nmd/main.tf b/terraform-ci-infra/1n_nmd/main.tf
index 985f9ae..e3b64f5 100644 (file)
--- a/terraform-ci-infra/1n_nmd/main.tf
+++ b/terraform-ci-infra/1n_nmd/main.tf
@@ -5,31 +5,33 @@
 # and have them automatically associated with the root provider
 # configurations.
 module "alertmanager" {
-  source                         = "./alertmanager"
-  providers                      = {
+  source                             = "./alertmanager"
+  providers                          = {
     nomad = nomad.yul1
   }
 
   # nomad
-  nomad_datacenters              = [ "yul1" ]
+  nomad_datacenters                  = [ "yul1" ]
 
   # alertmanager
-  alertmanager_job_name          = "prod-alertmanager"
-  alertmanager_use_canary        = true
-  alertmanager_group_count       = 1
-  alertmanager_vault_secret      = {
-    use_vault_provider           = false,
-    vault_kv_policy_name         = "kv-secret",
-    vault_kv_path                = "secret/data/prometheus",
-    vault_kv_field_access_key    = "access_key",
-    vault_kv_field_secret_key    = "secret_key"
+  alertmanager_job_name              = "prod-alertmanager"
+  alertmanager_use_canary            = true
+  alertmanager_group_count           = 1
+  alertmanager_vault_secret          = {
+    use_vault_provider               = false,
+    vault_kv_policy_name             = "kv-secret",
+    vault_kv_path                    = "secret/data/prometheus",
+    vault_kv_field_access_key        = "access_key",
+    vault_kv_field_secret_key        = "secret_key"
   }
-  alertmanager_version           = "0.21.0"
-  alertmanager_cpu               = 1000
-  alertmanager_mem               = 1024
-  alertmanager_port              = 9093
-  alertmanager_slack_api_key     = "TE07RD1V1/B01L7PQK9S8/pbADGhhhj60JSxHRi3K0NoW6"
-  alertmanager_slack_channel     = "fdio-infra-monitoring"
+  alertmanager_version               = "0.21.0"
+  alertmanager_cpu                   = 1000
+  alertmanager_mem                   = 1024
+  alertmanager_port                  = 9093
+  alertmanager_slack_jenkins_api_key = "TE07RD1V1/B01LPL8KM0F/KAd80wc9vS8CPMtrNtmQqCfT"
+  alertmanager_slack_jenkins_channel = "fdio-jobs-monitoring"
+  alertmanager_slack_default_api_key = "TE07RD1V1/B01L7PQK9S8/vJTSCr3OUprfAEGKBV5uZoJ6"
+  alertmanager_slack_default_channel = "fdio-infra-monitoring"
 }
 
 module "grafana" {
@@ -108,9 +110,11 @@ module "nginx" {
 
   # nomad
   nomad_datacenters              = [ "yul1" ]
+  nomad_host_volume              = "prod-volume-data1-1"
 
   # nginx
   nginx_job_name                 = "prod-nginx"
+  nginx_use_host_volume          = true
 }
 
 module "prometheus" {
@@ -154,6 +158,8 @@ module "vpp_device" {
   # csit_shim
   csit_shim_job_name             = "prod-device-csit-shim"
   csit_shim_group_count          = "1"
-  csit_shim_cpu                  = "1000"
-  csit_shim_mem                  = "5000"
+  csit_shim_cpu                  = "1500"
+  csit_shim_mem                  = "4096"
+  csit_shim_image_aarch64        = "csit_shim-ubuntu1804:local"
+  csit_shim_image_x86_64         = "csit_shim-ubuntu1804:local"
 }
\ No newline at end of file