Improves consistency in static grains during cloud-init

Having these grains set when their value is known helps salt work
properly even in cases when ec2_tags or ec2 grain plugins aren't
working.

base/bastion/cloud-init/cloud-init.tpl

@@ -35,9 +35,9 @@ write_files:
 - content: |
     grains:
       environment: ${ environment }
-      aws_region: ${ aws_region }
       aws_partition: ${ aws_partition }
       aws_partition_alias: ${ aws_partition_alias }
+      aws_region: ${ aws_region }
   path: /etc/salt/minion.d/cloud_init_grains.conf
 
 #yum_repos:

base/dns/resolver_instance/cloud-init/cloud-init.tpl

@@ -35,9 +35,9 @@ write_files:
 - content: |
     grains:
       environment: ${ environment }
-      aws_region: ${ aws_region }
       aws_partition: ${ aws_partition }
       aws_partition_alias: ${ aws_partition_alias }
+      aws_region: ${ aws_region }
   path: /etc/salt/minion.d/cloud_init_grains.conf
 
 yum_repos:

base/interconnects/cloud-init/cloud-init.tpl

@@ -4,7 +4,22 @@ hostname: ${hostname}
 salt-master: ${saltmaster}
 fqdn: ${fqdn}
 
-# A lot of this could be done via salt. But for simplicity, i'm presently keeping it out.
+write_files:
+- content: |
+    ${fqdn}
+  path: /etc/salt/minion_id
+- content: |
+    master: ${salt_master}
+  path: /etc/salt/minion
+- content: |
+    grains:
+      environment: ${ environment }
+      aws_partition: ${ aws_partition }
+      aws_partition_alias: ${ aws_partition_alias }
+      interconnect_id: ${ interconnect_id }
+      vpc_cidr: ${ vpc_cidr }
+      aws_region: ${ aws_region }
+  path: /etc/salt/minion.d/cloud_init_grains.conf
 
 yum_repos:
   epel-release:
@@ -26,15 +41,6 @@ growpart:
   ignore_growroot_disabled: false
 
 runcmd:
- - 'mkdir -p /etc/salt/minion.d'
- - 'echo ${fqdn} > /etc/salt/minion_id'
- - 'echo master: ${saltmaster} > /etc/salt/minion'
- - 'echo grains: > /etc/salt/minion.d/cloud_init_grains.conf'
- - 'echo "  environment:         " ${ environment }         >> /etc/salt/minion.d/cloud_init_grains.conf'
- - 'echo "  aws_partition:       " ${ aws_partition }       >> /etc/salt/minion.d/cloud_init_grains.conf'
- - 'echo "  aws_partition_alias: " ${ aws_partition_alias } >> /etc/salt/minion.d/cloud_init_grains.conf'
- - 'echo "  interconnect_id:     " ${ interconnect_id }     >> /etc/salt/minion.d/cloud_init_grains.conf'
- - 'echo "  vpc_cidr:            " ${ vpc_cidr }            >> /etc/salt/minion.d/cloud_init_grains.conf'
  - /bin/systemctl restart salt-minion 
  - /bin/systemctl enable salt-minion
  - /bin/systemctl start amazon-ssm-agent

base/mailrelay/cloud-init/cloud-init.tpl

@@ -35,9 +35,9 @@ write_files:
 - content: |
     grains:
       environment: ${ environment }
-      aws_region: ${ aws_region }
       aws_partition: ${ aws_partition }
       aws_partition_alias: ${ aws_partition_alias }
+      aws_region: ${ aws_region }
   path: /etc/salt/minion.d/cloud_init_grains.conf
 
 #yum_repos:

base/openvpn/cloud-init/cloud-init.tpl

@@ -35,9 +35,9 @@ write_files:
 - content: |
     grains:
       environment: ${ environment }
-      aws_region: ${ aws_region }
       aws_partition: ${ aws_partition }
       aws_partition_alias: ${ aws_partition_alias }
+      aws_region: ${ aws_region }
   path: /etc/salt/minion.d/cloud_init_grains.conf
 
 #yum_repos:

base/proxy_server/cloud-init/cloud-init.tpl

@@ -32,9 +32,9 @@ write_files:
 - content: |
     grains:
       environment: ${ environment }
-      aws_region: ${ aws_region }
       aws_partition: ${ aws_partition }
       aws_partition_alias: ${ aws_partition_alias }
+      aws_region: ${ aws_region }
   path: /etc/salt/minion.d/cloud_init_grains.conf
 
 #yum_repos:

base/repo_server/cloud-init/cloud-init.tpl

@@ -35,9 +35,9 @@ write_files:
 - content: |
     grains:
       environment: ${ environment }
-      aws_region: ${ aws_region }
       aws_partition: ${ aws_partition }
       aws_partition_alias: ${ aws_partition_alias }
+      aws_region: ${ aws_region }
   path: /etc/salt/minion.d/cloud_init_grains.conf
 
 #yum_repos:

base/sensu/cloud-init/cloud-init.tpl

@@ -33,6 +33,7 @@ write_files:
       environment: ${ environment }
       aws_partition: ${ aws_partition }
       aws_partition_alias: ${ aws_partition_alias }
+      aws_region: ${ aws_region }
   path: /etc/salt/minion.d/cloud_init_grains.conf
 
 #yum_repos:

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

@@ -34,11 +34,11 @@ write_files:
   path: /etc/salt/minion
 - content: |
     grains:
-      splunk_prefix: ${ splunk_prefix }
       environment: ${ environment }
-      aws_region: ${ aws_region }
       aws_partition: ${ aws_partition }
       aws_partition_alias: ${ aws_partition_alias }
+      splunk_prefix: ${ splunk_prefix }
+      aws_region: ${ aws_region }
   path: /etc/salt/minion.d/cloud_init_grains.conf
 
 #yum_repos:

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

@@ -34,11 +34,11 @@ write_files:
   path: /etc/salt/minion
 - content: |
     grains:
-      splunk_prefix: ${ splunk_prefix }
       environment: ${ environment }
-      aws_region: ${ aws_region }
       aws_partition: ${ aws_partition }
       aws_partition_alias: ${ aws_partition_alias }
+      splunk_prefix: ${ splunk_prefix }
+      aws_region: ${ aws_region }
   path: /etc/salt/minion.d/cloud_init_grains.conf
 
 #yum_repos:

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

@@ -34,11 +34,11 @@ write_files:
   path: /etc/salt/minion
 - content: |
     grains:
-      splunk_prefix: ${ splunk_prefix }
       environment: ${ environment }
-      aws_region: ${ aws_region }
       aws_partition: ${ aws_partition }
       aws_partition_alias: ${ aws_partition_alias }
+      splunk_prefix: ${ splunk_prefix }
+      aws_region: ${ aws_region }
   path: /etc/salt/minion.d/cloud_init_grains.conf
 
 #yum_repos:

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

@@ -34,11 +34,11 @@ write_files:
   path: /etc/salt/minion
 - content: |
     grains:
-      splunk_prefix: ${ splunk_prefix }
       environment: ${ environment }
-      aws_region: ${ aws_region }
       aws_partition: ${ aws_partition }
       aws_partition_alias: ${ aws_partition_alias }
+      splunk_prefix: ${ splunk_prefix }
+      aws_region: ${ aws_region }
   path: /etc/salt/minion.d/cloud_init_grains.conf
 
 #yum_repos:

base/vault/cloud-init/cloud-init.tpl

@@ -31,9 +31,9 @@ write_files:
 - content: |
     grains:
       environment: ${ environment }
-      aws_region: ${ aws_region }
       aws_partition: ${ aws_partition }
       aws_partition_alias: ${ aws_partition_alias }
+      aws_region: ${ aws_region }
   path: /etc/salt/minion.d/cloud_init_grains.conf
 
 #yum_repos: