Merge pull request hashicorp#12 from tensult/agent-install

Rearranged agent-install
Sk20kaushik · Feb 13, 2019 · 35ecf77 · 35ecf77
2 parents 10179b1 + 7313342
commit 35ecf77
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 48 deletions.
diff --git a/aws/agent-install/agent-windows.tf b/aws/agent-install/agent-windows.tf
@@ -1,51 +1,3 @@
-resource "aws_ssm_document" "windows_awscli" {
-  name          = "Install_AWSCLI_windows"
-  document_type = "Command"
-
-  content = <<DOC
-  {
-     "schemaVersion": "2.2",
-     "description": "Run a script to securely install Agent in Windows 2012 instance",
-     "mainSteps": [
-        {
-            "action":"aws:runPowerShellScript",
-            "name": "downloadAWSCLI",
-            "inputs":{
-               "runCommand":[
-                  "mkdir 'C:\\Temp'\n",
-                  "Invoke-WebRequest -Uri \"https://s3.amazonaws.com/aws-cli/AWSCLI64PY3.msi\" -OutFile 'C:\\Temp\\AWS_CLI.msi'\n",
-                  "dir 'C:\\Temp\\'\n",
-                  "echo 'AWS CLI is downloaded.'"
-               ]
-            }
-        },
-        {
-           "action": "aws:applications",
-           "name": "installApplication",
-           "inputs": {
-              "parameters": "/quiet",
-              "action": "Install",
-              "source": "C:\\Temp\\AWS_CLI.msi"
-            }
-         },
-         {
-            "action":"aws:runPowerShellScript",
-            "name": "waitForAWSCLI",
-            "inputs":{
-               "runCommand":[
-                  "while (!(Test-Path 'C:\\Program Files\\Amazon\\AWSCLI\\bin\\aws.cmd')){ Wait-Event -Timeout 10}\n",
-                  "& 'C:\\Program Files\\Amazon\\AWSCLI\\bin\\aws.cmd'\n",
-                  "echo 'AWS CLI is installed.'\n",
-                  "Remove-Item -Path 'C:\\Temp\\AWS_CLI.msi'\n",
-                  "Restart-Computer -Force"
-               ]
-            }
-         }
-      ]
-   }
-DOC
-}
-
 resource "aws_ssm_document" "snow_agent_windows" {
   name          = "Snow_Agent_Windows"
   document_type = "Command"

diff --git a/aws/agent-install/aws-cli.tf b/aws/agent-install/aws-cli.tf
@@ -0,0 +1,47 @@
+resource "aws_ssm_document" "windows_awscli" {
+  name          = "Install_AWSCLI_windows"
+  document_type = "Command"
+
+  content = <<DOC
+  {
+     "schemaVersion": "2.2",
+     "description": "Run a script to securely install Agent in Windows 2012 instance",
+     "mainSteps": [
+        {
+            "action":"aws:runPowerShellScript",
+            "name": "downloadAWSCLI",
+            "inputs":{
+               "runCommand":[
+                  "mkdir 'C:\\Temp'\n",
+                  "Invoke-WebRequest -Uri \"https://s3.amazonaws.com/aws-cli/AWSCLI64PY3.msi\" -OutFile 'C:\\Temp\\AWS_CLI.msi'\n",
+                  "dir 'C:\\Temp\\'\n",
+                  "echo 'AWS CLI is downloaded.'"
+               ]
+            }
+        },
+        {
+           "action": "aws:applications",
+           "name": "installApplication",
+           "inputs": {
+              "parameters": "/quiet",
+              "action": "Install",
+              "source": "C:\\Temp\\AWS_CLI.msi"
+            }
+         },
+         {
+            "action":"aws:runPowerShellScript",
+            "name": "waitForAWSCLI",
+            "inputs":{
+               "runCommand":[
+                  "while (!(Test-Path 'C:\\Program Files\\Amazon\\AWSCLI\\bin\\aws.cmd')){ Wait-Event -Timeout 10}\n",
+                  "& 'C:\\Program Files\\Amazon\\AWSCLI\\bin\\aws.cmd'\n",
+                  "echo 'AWS CLI is installed.'\n",
+                  "Remove-Item -Path 'C:\\Temp\\AWS_CLI.msi'\n",
+                  "Restart-Computer -Force"
+               ]
+            }
+         }
+      ]
+   }
+DOC
+}