diff --git a/enos/enos-scenario-e2e-aws-rdp-base.hcl b/enos/enos-scenario-e2e-aws-rdp-base.hcl index 2360c36a59..a5ecc91aea 100644 --- a/enos/enos-scenario-e2e-aws-rdp-base.hcl +++ b/enos/enos-scenario-e2e-aws-rdp-base.hcl @@ -308,10 +308,12 @@ scenario "e2e_aws_rdp_base" { aws_region = var.aws_region max_page_size = step.create_boundary_cluster.max_page_size worker_tag_collocated = local.collocated_tag + worker_address = step.create_windows_worker.public_ip target_rdp_domain_controller_addr = step.create_rdp_domain_controller.private_ip target_rdp_domain_controller_addr_ipv6 = local.ip_version == "4" ? "" : step.create_rdp_domain_controller.ipv6[0] target_rdp_domain_controller_user = step.create_rdp_domain_controller.admin_username target_rdp_domain_controller_password = step.create_rdp_domain_controller.password + target_rdp_domain_controller_ssh_key = step.create_rdp_domain_controller.ssh_private_key target_rdp_member_server_addr = step.create_rdp_member_server.private_ip target_rdp_member_server_domain_hostname = step.create_rdp_member_server.domain_hostname target_rdp_member_server_user = step.create_rdp_member_server.admin_username diff --git a/enos/modules/test_e2e/main.tf b/enos/modules/test_e2e/main.tf index 275fd70032..39ace962e3 100644 --- a/enos/modules/test_e2e/main.tf +++ b/enos/modules/test_e2e/main.tf @@ -176,6 +176,11 @@ variable "target_rdp_domain_controller_password" { type = string default = "" } +variable "target_rdp_domain_controller_ssh_key" { + description = "Path to the ssh key for the windows domain controller and worker" + type = string + default = "" +} variable "target_rdp_member_server_addr" { description = "Address of RDP member server" type = string @@ -295,6 +300,7 @@ resource "enos_local_exec" "run_e2e_test" { E2E_TARGET_RDP_DOMAIN_CONTROLLER_ADDR_IPV6 = var.target_rdp_domain_controller_addr_ipv6 E2E_TARGET_RDP_DOMAIN_CONTROLLER_USER = var.target_rdp_domain_controller_user E2E_TARGET_RDP_DOMAIN_CONTROLLER_PASSWORD = var.target_rdp_domain_controller_password + E2E_TARGET_RDP_DOMAIN_CONTROLLER_SSH_KEY = var.target_rdp_domain_controller_ssh_key E2E_TARGET_RDP_MEMBER_SERVER_ADDR = var.target_rdp_member_server_addr E2E_TARGET_RDP_MEMBER_SERVER_DOMAIN_HOSTNAME = var.target_rdp_member_server_domain_hostname E2E_TARGET_RDP_MEMBER_SERVER_USER = var.target_rdp_member_server_user