Skip to content

Vmp fixes #6005

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Vmp fixes #6005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions enos/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ following lines
127.0.0.1 localhost worker
127.0.0.1 localhost vault
```
### AWS Credentials
Copy the AWS Account credentials from doormat and set it in the terminal, where the enos commands are run.

## Executing Scenarios
From the `enos` directory:
Expand Down
10 changes: 10 additions & 0 deletions enos/modules/aws_boundary/boundary-instances.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ resource "aws_instance" "controller" {
encrypted = true
}

metadata_options {
http_endpoint = "enabled"
http_tokens = "required"
}

tags = merge(local.common_tags,
{
Name = "${local.name_prefix}-boundary-controller-${count.index}-${split(":", data.aws_caller_identity.current.user_id)[1]}"
Expand Down Expand Up @@ -54,6 +59,11 @@ resource "aws_instance" "worker" {
encrypted = true
}

metadata_options {
http_endpoint = "enabled"
http_tokens = "required"
}

tags = merge(local.common_tags,
{
Name = "${local.name_prefix}-boundary-worker-${count.index}-${split(":", data.aws_caller_identity.current.user_id)[1]}",
Expand Down
1 change: 1 addition & 0 deletions enos/modules/aws_rdp_domain_controller/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,7 @@ resource "aws_instance" "domain_controller" {

metadata_options {
http_endpoint = "enabled"
http_tokens = "required"
instance_metadata_tags = "enabled"
}
get_password_data = true
Expand Down
1 change: 1 addition & 0 deletions enos/modules/aws_rdp_member_server/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,7 @@ ${var.domain_admin_password}

metadata_options {
http_endpoint = "enabled"
http_tokens = "required"
instance_metadata_tags = "enabled"
}
get_password_data = true
Expand Down
1 change: 1 addition & 0 deletions enos/modules/aws_rdp_member_server_with_worker/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ ${var.domain_admin_password}

metadata_options {
http_endpoint = "enabled"
http_tokens = "required"
instance_metadata_tags = "enabled"
}
get_password_data = true
Expand Down
7 changes: 6 additions & 1 deletion enos/modules/aws_target/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,13 +126,18 @@ resource "aws_instance" "target" {
"Type" : "target",
"Project" : "Enos",
"Project Name" : "qti-enos-boundary",
"Environment" : var.environment
"Environment" : var.environment,
"Enos User" : var.enos_user,
})

root_block_device {
encrypted = true
}

metadata_options {
http_endpoint = "enabled"
http_tokens = "required"
}
}

resource "enos_remote_exec" "wait" {
Expand Down
5 changes: 5 additions & 0 deletions enos/modules/aws_vault/vault-instances.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@ resource "aws_instance" "vault_instance" {
Type = local.vault_cluster_tag
},
)

metadata_options {
http_endpoint = "enabled"
http_tokens = "required"
}
}

resource "enos_remote_exec" "install_dependencies" {
Expand Down
1 change: 1 addition & 0 deletions enos/modules/aws_windows_client/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,7 @@ resource "aws_instance" "client" {

metadata_options {
http_endpoint = "enabled"
http_tokens = "required"
instance_metadata_tags = "enabled"
}
get_password_data = true
Expand Down
5 changes: 5 additions & 0 deletions enos/modules/aws_worker/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,11 @@ resource "aws_instance" "worker" {
Name = "${var.name_prefix}-boundary-worker-${split(":", data.aws_caller_identity.current.user_id)[1]}",
},
)

metadata_options {
http_endpoint = "enabled"
http_tokens = "required"
}
}

resource "enos_bundle_install" "worker" {
Expand Down
Loading