Merge pull request #172 from dividehex/bug1243421

Bug 1243421: Add yaml tags to window userdata for check_ami; r=grenade
mozilla-releng · Feb 1, 2016 · 6a3e196 · 6a3e196
2 parents 779cbce + e82819c
commit 6a3e196
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/configs/b-2008.user-data b/configs/b-2008.user-data
@@ -137,3 +137,8 @@ Move-Item -path $runLog -destination ([IO.Path]::Combine($logDir, ('userdata-run
 Move-Item -path $ec2Log -destination ([IO.Path]::Combine($logDir, ('ec2config-run-{{0}}.log' -f [DateTime]::Now.ToString("yyyyMMdd-HHmm"))))-ErrorAction SilentlyContinue
 </powershell>
 <persist>true</persist>
+<mozuserdata>
+# see bug 1243421
+hostname: {fqdn}
+moz_instance_type: {moz_instance_type}
+</mozuserdata>
diff --git a/configs/t-w732.user-data b/configs/t-w732.user-data
@@ -139,4 +139,9 @@ if (!($hostname.Contains("-spot-"))) {{
 Move-Item -path $runLog -destination ([IO.Path]::Combine($logDir, ('userdata-run-{{0}}.log' -f [DateTime]::Now.ToString("yyyyMMdd-HHmm"))))-ErrorAction SilentlyContinue
 Move-Item -path $ec2Log -destination ([IO.Path]::Combine($logDir, ('ec2config-run-{{0}}.log' -f [DateTime]::Now.ToString("yyyyMMdd-HHmm"))))-ErrorAction SilentlyContinue
 </powershell>
-<persist>true</persist>
+<persist>true</persist>
+<mozuserdata>
+# see bug 1243421
+hostname: {fqdn}
+moz_instance_type: {moz_instance_type}
+</mozuserdata>