Fixes tech debt revealed during highstate application

* Add instance profile to resolvers
* Set aws tag during cloud init to fix a chicken/egg issue

base/dns/resolver_instance/main.tf

@@ -36,10 +36,11 @@ resource "aws_instance" "instance" {
   key_name = var.resolver_instance_key_name
   monitoring = false
 
+  iam_instance_profile = "msoc-default-instance-profile"
+
   ami = local.ami_map["minion"]
   lifecycle { ignore_changes = [ ami, key_name, user_data ] }
 
-
   root_block_device {
       volume_type = "gp2"
       #volume_size = "60"

base/splunk_servers/cluster_master/cloud-init/cloud-init.tpl

@@ -34,6 +34,7 @@ write_files:
   path: /etc/salt/minion
 - content: |
     grains:
+      splunk_prefix: ${ splunk_prefix }
       environment: ${ environment }
       aws_region: ${ aws_region }
       aws_partition: ${ aws_partition }

base/splunk_servers/cluster_master/main.tf

@@ -160,6 +160,7 @@ data "template_file" "cloud-init" {
   vars = {
     hostname = local.instance_name
     fqdn = "${local.instance_name}.${var.dns_info["private"]["zone"]}"
+    splunk_prefix = var.prefix
     environment = var.environment
     salt_master  = var.salt_master
     proxy = var.proxy

base/splunk_servers/heavy_forwarder/cloud-init/cloud-init.tpl

@@ -34,6 +34,7 @@ write_files:
   path: /etc/salt/minion
 - content: |
     grains:
+      splunk_prefix: ${ splunk_prefix }
       environment: ${ environment }
       aws_region: ${ aws_region }
       aws_partition: ${ aws_partition }

base/splunk_servers/heavy_forwarder/main.tf

@@ -160,6 +160,7 @@ data "template_file" "cloud-init" {
   vars = {
     hostname = local.instance_name
     fqdn = "${local.instance_name}.${var.dns_info["private"]["zone"]}"
+    splunk_prefix = var.prefix
     environment = var.environment
     salt_master  = var.salt_master
     proxy = var.proxy

base/splunk_servers/indexer_cluster/cloud-init.tf

@@ -5,6 +5,7 @@ data "template_file" "cloud-init" {
   vars = {
     prefix = var.prefix
     zone = var.dns_info["private"]["zone"]
+    splunk_prefix: ${ splunk_prefix }
     environment = var.environment
     salt_master  = var.salt_master
     proxy = var.proxy

base/splunk_servers/indexer_cluster/cloud-init/cloud-init.tpl

@@ -34,6 +34,7 @@ write_files:
   path: /etc/salt/minion
 - content: |
     grains:
+      splunk_prefix: ${ splunk_prefix }
       environment: ${ environment }
       aws_region: ${ aws_region }
       aws_partition: ${ aws_partition }

base/splunk_servers/searchhead/cloud-init/cloud-init.tpl

@@ -34,6 +34,7 @@ write_files:
   path: /etc/salt/minion
 - content: |
     grains:
+      splunk_prefix: ${ splunk_prefix }
       environment: ${ environment }
       aws_region: ${ aws_region }
       aws_partition: ${ aws_partition }

base/splunk_servers/searchhead/main.tf

@@ -160,6 +160,7 @@ data "template_file" "cloud-init" {
   vars = {
     hostname = local.instance_name
     fqdn = "${local.instance_name}.${var.dns_info["private"]["zone"]}"
+    splunk_prefix = var.prefix
     environment = var.environment
     salt_master  = var.salt_master
     proxy = var.proxy