From f2c7b1a32b6c76ecb7b03e9fbc8b09d0c10769cf Mon Sep 17 00:00:00 2001
From: VakarisZ <vakarisz@yahoo.com>
Date: Mon, 16 Dec 2019 18:41:31 +0200
Subject: [PATCH] Added readmes, improved instance naming

---
 envs/monkey_maker/README.md                   | 28 +++++++++++++++++++
 envs/monkey_maker/terraform/instances.tf      |  2 +-
 envs/os_compatability/README.md               | 28 +++++++++++++++++++
 .../terraform/instance_template/main.tf       |  2 +-
 envs/os_compatability/terraform/instances.tf  |  2 +-
 5 files changed, 59 insertions(+), 3 deletions(-)
 create mode 100644 envs/monkey_maker/README.md
 create mode 100644 envs/os_compatability/README.md

diff --git a/envs/monkey_maker/README.md b/envs/monkey_maker/README.md
new file mode 100644
index 000000000..275ab6bbf
--- /dev/null
+++ b/envs/monkey_maker/README.md
@@ -0,0 +1,28 @@
+# Monkey maker
+
+## About
+
+Monkey maker is an environment on AWS that 
+is designed for monkey binary building. 
+This environment is deployed using terraform scripts
+located in this directory.
+
+## Setup
+
+To setup you need to put `accessKeys` file into `./aws_keys` directory.
+
+Contents of `accessKeys` file should be as follows:
+
+```
+[default]
+aws_access_key_id = <...>
+aws_secret_access_key = <...>
+```
+Also review `./terraform/config.tf` file.
+
+Launch the environment by going into `terraform` folder and running
+```angular2html
+terraform init
+terraform apply
+```
+
diff --git a/envs/monkey_maker/terraform/instances.tf b/envs/monkey_maker/terraform/instances.tf
index a7dec7ab1..495b2ca64 100644
--- a/envs/monkey_maker/terraform/instances.tf
+++ b/envs/monkey_maker/terraform/instances.tf
@@ -1,5 +1,5 @@
 resource "aws_instance" "island_windows" {
-  ami           = "ami-09fe2745618d2af42"
+  ami           = "ami-086f705bf43f47ae7"
   instance_type = "t2.micro"
   private_ip = "10.0.0.251"
   subnet_id = "${aws_subnet.main.id}"
diff --git a/envs/os_compatability/README.md b/envs/os_compatability/README.md
new file mode 100644
index 000000000..efeb04319
--- /dev/null
+++ b/envs/os_compatability/README.md
@@ -0,0 +1,28 @@
+# OS compatibility
+
+## About
+
+OS compatibility is an environment on AWS that 
+is designed to test monkey binary compatibility on
+different operating systems. 
+This environment is deployed using terraform scripts
+located in this directory.
+
+## Setup
+
+To setup you need to put `accessKeys` file into `./aws_keys` directory.
+
+Contents of `accessKeys` file should be as follows:
+
+```
+[default]
+aws_access_key_id = <...>
+aws_secret_access_key = <...>
+```
+Also review `./terraform/config.tf` file.
+
+Launch the environment by going into `terraform` folder and running
+```angular2html
+terraform init
+terraform apply
+```
diff --git a/envs/os_compatability/terraform/instance_template/main.tf b/envs/os_compatability/terraform/instance_template/main.tf
index 44c1c9c76..1709a4de1 100644
--- a/envs/os_compatability/terraform/instance_template/main.tf
+++ b/envs/os_compatability/terraform/instance_template/main.tf
@@ -5,7 +5,7 @@ resource "aws_instance" "os_test_machine" {
   subnet_id = "${data.aws_subnet.main.id}"
   key_name = "os_compat"
   tags = {
-    Name = "${var.name}"
+    Name = "os_compat_${var.name}"
   }
   vpc_security_group_ids = ["${data.aws_security_group.os_compat_instance.id}"]
   associate_public_ip_address = true
diff --git a/envs/os_compatability/terraform/instances.tf b/envs/os_compatability/terraform/instances.tf
index c8b892f89..7a3cd9285 100644
--- a/envs/os_compatability/terraform/instances.tf
+++ b/envs/os_compatability/terraform/instances.tf
@@ -320,7 +320,7 @@ module "windows_2008" {
 
 module "windows_2008_32" {
   source = "./instance_template"
-  name = "windows_2008"
+  name = "windows_2008_32"
   ami = "ami-0acaec54bac5cbb8f"
   ip = "10.0.0.6"
   env_vars = "${local.env_vars}"