From a74a7cc48f18a76464cd9d9a974371bb0938e56f Mon Sep 17 00:00:00 2001
From: VakarisZ <vakarisz@yahoo.com>
Date: Wed, 8 Apr 2020 12:14:33 +0300
Subject: [PATCH] Added tunneling-12 (windows) machine to monkeyzoo infra and
test config.
---
.../blackbox/island_configs/TUNNELING.conf | 4 +++-
envs/monkey_zoo/terraform/monkey_zoo.tf | 15 +++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/envs/monkey_zoo/blackbox/island_configs/TUNNELING.conf b/envs/monkey_zoo/blackbox/island_configs/TUNNELING.conf
index 306a683eb..80d85a7b7 100644
--- a/envs/monkey_zoo/blackbox/island_configs/TUNNELING.conf
+++ b/envs/monkey_zoo/blackbox/island_configs/TUNNELING.conf
@@ -5,6 +5,7 @@
"Password1!",
"3Q=(Ge(+&w]*",
"`))jU7L(w}",
+ "t67TC5ZDmz",
"12345678",
"another_one",
"and_another_one",
@@ -30,7 +31,8 @@
"subnet_scan_list": [
"10.2.2.9",
"10.2.1.10",
- "10.2.0.11"
+ "10.2.0.11",
+ "10.2.0.12"
]
},
"network_analysis": {
diff --git a/envs/monkey_zoo/terraform/monkey_zoo.tf b/envs/monkey_zoo/terraform/monkey_zoo.tf
index 30602f237..bb7c4d72d 100644
--- a/envs/monkey_zoo/terraform/monkey_zoo.tf
+++ b/envs/monkey_zoo/terraform/monkey_zoo.tf
@@ -201,6 +201,21 @@ resource "google_compute_instance_from_template" "tunneling-11" {
}
}
+resource "google_compute_instance_from_template" "tunneling-12" {
+ name = "${local.resource_prefix}tunneling-12"
+ source_instance_template = local.default_windows
+ boot_disk{
+ initialize_params {
+ image = data.google_compute_image.tunneling-12.self_link
+ }
+ auto_delete = true
+ }
+ network_interface{
+ subnetwork="${local.resource_prefix}tunneling2-main"
+ network_ip="10.2.0.12"
+ }
+}
+
resource "google_compute_instance_from_template" "sshkeys-11" {
name = "${local.resource_prefix}sshkeys-11"
source_instance_template = local.default_ubuntu