From bba5913f5a25b23e3fb839d702ec1f6f811334bd Mon Sep 17 00:00:00 2001
From: Attila Farkas <394097@mail.muni.cz>
Date: Tue, 13 Oct 2020 11:37:02 +0200
Subject: [PATCH] Adjust vagrant arguments of windows hosts
---
modules/preprocessing.py | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/modules/preprocessing.py b/modules/preprocessing.py
index 5bebac0..95e7de1 100644
--- a/modules/preprocessing.py
+++ b/modules/preprocessing.py
@@ -45,7 +45,7 @@ def _add_extra_arguments(definitions, flags):
if "border_router" in flags and flags["ansible_local"]:
for device in itertools.chain(definitions["hosts"],
definitions["routers"]):
- if "synced_folder" not in device:
+ if "synced_folder" not in device and "communicator" not in device:
device["synced_folder"] = "\".\", \"/vagrant\", type: \"rsync"\
"\", rsync__exclude: \".git/\""
@@ -81,6 +81,12 @@ def _find_windows_boxes(definitions):
return windows_hosts
+def _add_windows_attributes(host):
+ """Add vagrant attributes to windows hosts"""
+ host["communicator"] = "winrm"
+ host["winrm_username"] = "vagrant"
+
+
def preprocess(definitions, flags):
"""Run preprocessing.
@@ -107,13 +113,22 @@ def preprocess(definitions, flags):
cleanup_and_exit("Preprocessing not successful: "
"Could not create border router (" + error + ")")
+ windows_hosts = _find_windows_boxes(definitions)
try:
- if _find_windows_boxes(definitions):
+ if windows_hosts:
create_controller(definitions)
except (ValueError, IndexError) as error:
cleanup_and_exit("Preprocessing not successful: "
"Could not create controller (" + error + ")")
+ try:
+ for host in definitions["hosts"]:
+ if host["name"] in windows_hosts:
+ _add_windows_attributes(host)
+ except (ValueError, IndexError) as error:
+ cleanup_and_exit("Preprocessing not successful: "
+ "Could not create controller (" + error + ")")
+
try:
_configure_routers(definitions)
except Exception:
--
GitLab