فهرست منبع

Fixes DNS Servers for vpc-vmray; FRTIB Cust SH Type

Special case handling was incorrect for prod.

To be tagged v5.0.2
Fred Damstra [afs macbook] 3 سال پیش
والد
کامیت
22ff1b8e2e
3فایلهای تغییر یافته به همراه8 افزوده شده و 2 حذف شده
  1. 1 0
      base/splunk_servers/customer_searchhead/config.tf
  2. 1 1
      base/standard_vpc/main.tf
  3. 6 1
      variables/dns_info.tf

+ 1 - 0
base/splunk_servers/customer_searchhead/config.tf

@@ -4,6 +4,7 @@ locals {
   instance_type_exceptions = {
     afs-mdr-test-modelclient-gov = "t3a.small",
     mdr-prod-afs                 = "m5a.4xlarge"
+    mdr-prod-frtib               = "m5a.4xlarge"
   }
   instance_type = lookup(local.instance_type_exceptions, var.account_name, local.instance_type_default)
 

+ 1 - 1
base/standard_vpc/main.tf

@@ -87,7 +87,7 @@ module "vpc" {
   dhcp_options_domain_name = var.dns_info["private"]["zone"]
 
   # Special case: VMRay uses its own dns server
-  dhcp_options_domain_name_servers = var.vpc_info["name"] == "vpc-vmray" ? ["10.20.6.7"] : local.dns_servers
+  dhcp_options_domain_name_servers = local.dns_servers
   dhcp_options_ntp_servers         = ["169.254.169.123"]
   dhcp_options_tags                = merge(local.standard_tags, var.tags)
 

+ 6 - 1
variables/dns_info.tf

@@ -1,7 +1,12 @@
 locals {
-  dns_servers = {
+  dns_servers_default = {
     prod   = ["10.40.2.77", "10.40.2.228"],
     test   = ["10.20.2.64", "10.20.2.185"],
     common = []
   }[var.environment]
+  dns_servers_exceptions = {
+    afs-mdr-prod-malware-gov = ["10.32.6.126"],
+    afs-mdr-test-malware-gov = ["10.20.6.7"]
+  }
+  dns_servers = lookup(local.dns_servers_exceptions, var.account_name, local.dns_servers_default)
 }