Browse Source

Fixes for doed and new customers

Brad Poulton 3 years ago
parent
commit
a1c17add68

+ 1 - 0
base/splunk_servers/cluster_master/main.tf

@@ -36,6 +36,7 @@ resource "aws_instance" "instance" {
   iam_instance_profile                 = module.instance_profile.profile_id
 
   metadata_options {
+    http_endpoint = "enabled"
     http_tokens = "optional" # tfsec:ignore:aws-ec2-enforce-http-token-imds Splunk uses v1 by default. MSOCI-2150
   }
 

+ 1 - 0
base/splunk_servers/heavy_forwarder/main.tf

@@ -36,6 +36,7 @@ resource "aws_instance" "instance" {
   iam_instance_profile                 = module.instance_profile.profile_id
 
   metadata_options {
+    http_endpoint = "enabled"
     http_tokens = "optional" # tfsec:ignore:aws-ec2-enforce-http-token-imds Splunk uses v1 by default. AWS Addon doesn't support it at all? MSOCI-2150
   }
 

+ 1 - 1
base/splunk_servers/indexer_cluster/config.tf

@@ -19,7 +19,7 @@ locals {
   splunk_asg_sizes_default = [1, 1, 0]
   splunk_asg_sizes_exceptions = {
     mdr-prod-afs                 = [1, 1, 1],
-    mdr-prod-doed                = [0, 0, 0],
+    mdr-prod-doed                = [1, 1, 1],
     afs-mdr-prod-c2-gov          = [1, 1, 1],
     afs-mdr-prod-modelclient-gov = [0, 0, 0],
     afs-mdr-test-modelclient-gov = [1, 1, 1],

+ 1 - 1
base/splunk_servers/indexer_cluster/elb-with-acks.tf

@@ -140,7 +140,7 @@ resource "aws_load_balancer_policy" "listener_policy-tls-1-2" {
 
   policy_attribute {
     name  = "Reference-Security-Policy"
-    value = "ELBSecurityPolicy-FS-1-2-Res-2020-10" # PFS, TLS1.2, and GCM; most "restrictive" policy
+    value = "ELBSecurityPolicy-TLS-1-2-2017-01" # PFS, TLS1.2, and GCM; most "restrictive" policy
   }
 
   # Workaround for bug above.  If changing TLS policy then be

+ 1 - 0
base/splunk_servers/searchhead/main.tf

@@ -39,6 +39,7 @@ resource "aws_instance" "instance" {
   iam_instance_profile                 = local.is_moose ? module.moose_instance_profile[0].profile_id : "splunk-sh-instance-profile"
 
   metadata_options {
+    http_endpoint = "enabled"
     http_tokens = "optional" # tfsec:ignore:aws-ec2-enforce-http-token-imds Splunk uses v1 by default. MSOCI-2150
   }