diff options
author | Peter Mikus <peter.mikus@protonmail.ch> | 2025-01-09 07:13:09 +0100 |
---|---|---|
committer | Peter Mikus <peter.mikus@protonmail.ch> | 2025-01-09 06:20:20 +0000 |
commit | 3832604d7b656a2ef99ec5a19c2dfd911952ff68 (patch) | |
tree | 5987fb327db4d8efe215e811f899708e183561e5 | |
parent | b75963fcea4fed83485b07fb26583ce90153b273 (diff) |
fix(infra): New AWS images
Signed-off-by: Peter Mikus <peter.mikus@protonmail.ch>
Change-Id: I8dc62881c196a268f4e13bb77ffe24735c8fcc36
8 files changed, 38 insertions, 37 deletions
diff --git a/fdio.infra.ansible/roles/aws/tasks/main.yaml b/fdio.infra.ansible/roles/aws/tasks/main.yaml index 750bf9f4f7..47b8c10135 100644 --- a/fdio.infra.ansible/roles/aws/tasks/main.yaml +++ b/fdio.infra.ansible/roles/aws/tasks/main.yaml @@ -141,8 +141,9 @@ - name: "Add User" ansible.builtin.user: - createhome: "yes" - groups: "adm,sudo" + append: true + createhome: true + groups: "admin,adm,sudo" name: "testuser" password: "$6$Y62lhMGJD8YNzmJn$H4DSqjrwFp5WN3tOvIrF.g/G2duOV76zXHAmaA/RU8jfT8H8sDumLQe/Q.EmI5pjPv7dzgI8j9BQPWes7efBK0" shell: "/bin/bash" diff --git a/fdio.infra.ansible/roles/docker_images/tasks/main.yaml b/fdio.infra.ansible/roles/docker_images/tasks/main.yaml index 382c70b80a..e6171a2b01 100644 --- a/fdio.infra.ansible/roles/docker_images/tasks/main.yaml +++ b/fdio.infra.ansible/roles/docker_images/tasks/main.yaml @@ -1,12 +1,12 @@ --- # file: tasks/main.yaml -- name: "Build Base Docker Images" - import_tasks: "base.yaml" - when: > - inventory_hostname in groups["sut"] - tags: - - docker-base +#- name: "Build Base Docker Images" +# import_tasks: "base.yaml" +# when: > +# inventory_hostname in groups["sut"] +# tags: +# - docker-base - name: "Docker Orchestration for TG" import_tasks: "tg.yaml" diff --git a/fdio.infra.terraform/terraform-aws-1n-aws-c5n/variables.tf b/fdio.infra.terraform/terraform-aws-1n-aws-c5n/variables.tf index c165d52399..5016b935e2 100644 --- a/fdio.infra.terraform/terraform-aws-1n-aws-c5n/variables.tf +++ b/fdio.infra.terraform/terraform-aws-1n-aws-c5n/variables.tf @@ -38,7 +38,7 @@ variable "placement_group_strategy" { variable "tg_ami" { description = "AMI to use for the instance." type = string - default = "ami-05fc62a89ea9fdae4" + default = "ami-0c18f927fc6ac6c52" } variable "tg_associate_public_ip_address" { diff --git a/fdio.infra.terraform/terraform-aws-1n-c6in/variables.tf b/fdio.infra.terraform/terraform-aws-1n-c6in/variables.tf index 4af15ed579..f9cd5bc2ed 100644 --- a/fdio.infra.terraform/terraform-aws-1n-c6in/variables.tf +++ b/fdio.infra.terraform/terraform-aws-1n-c6in/variables.tf @@ -38,7 +38,7 @@ variable "placement_group_strategy" { variable "tg_ami" { description = "AMI to use for the instance." type = string - default = "ami-05fc62a89ea9fdae4" + default = "ami-0c18f927fc6ac6c52" } variable "tg_associate_public_ip_address" { diff --git a/fdio.infra.terraform/terraform-aws-2n-aws-c5n/variables.tf b/fdio.infra.terraform/terraform-aws-2n-aws-c5n/variables.tf index 9a2b04082e..096299757a 100644 --- a/fdio.infra.terraform/terraform-aws-2n-aws-c5n/variables.tf +++ b/fdio.infra.terraform/terraform-aws-2n-aws-c5n/variables.tf @@ -38,7 +38,7 @@ variable "placement_group_strategy" { variable "tg_ami" { description = "AMI to use for the instance." type = string - default = "ami-05fc62a89ea9fdae4" + default = "ami-0c18f927fc6ac6c52" } variable "tg_associate_public_ip_address" { @@ -74,7 +74,7 @@ variable "tg_source_dest_check" { variable "sut1_ami" { description = "AMI to use for the instance." type = string - default = "ami-04de4ffdd0dfa22e8" + default = "ami-0269b92e0a5932902" } variable "sut1_associate_public_ip_address" { diff --git a/fdio.infra.terraform/terraform-aws-2n-c6in/variables.tf b/fdio.infra.terraform/terraform-aws-2n-c6in/variables.tf index a8450790b3..9f14b5b4d3 100644 --- a/fdio.infra.terraform/terraform-aws-2n-c6in/variables.tf +++ b/fdio.infra.terraform/terraform-aws-2n-c6in/variables.tf @@ -50,7 +50,7 @@ variable "placement_group_strategy" { variable "tg_ami" { description = "AMI to use for the instance." type = string - default = "ami-05fc62a89ea9fdae4" + default = "ami-0c18f927fc6ac6c52" } variable "tg_associate_public_ip_address" { @@ -86,7 +86,7 @@ variable "tg_source_dest_check" { variable "sut1_ami" { description = "AMI to use for the instance." type = string - default = "ami-04de4ffdd0dfa22e8" + default = "ami-0269b92e0a5932902" } variable "sut1_associate_public_ip_address" { diff --git a/fdio.infra.terraform/terraform-aws-2n-c7gn/variables.tf b/fdio.infra.terraform/terraform-aws-2n-c7gn/variables.tf index 2e6d58b505..1bdb701c8a 100644 --- a/fdio.infra.terraform/terraform-aws-2n-c7gn/variables.tf +++ b/fdio.infra.terraform/terraform-aws-2n-c7gn/variables.tf @@ -38,7 +38,7 @@ variable "placement_group_strategy" { variable "tg_ami" { description = "AMI to use for the instance." type = string - default = "ami-05fc62a89ea9fdae4" + default = "ami-0c18f927fc6ac6c52" } variable "tg_associate_public_ip_address" { diff --git a/fdio.infra/packer-aws-sut/ubuntu_noble_x86.pkr.hcl b/fdio.infra/packer-aws-sut/ubuntu_noble_x86.pkr.hcl index 1b925e0404..93e6d08a8c 100644 --- a/fdio.infra/packer-aws-sut/ubuntu_noble_x86.pkr.hcl +++ b/fdio.infra/packer-aws-sut/ubuntu_noble_x86.pkr.hcl @@ -83,28 +83,28 @@ source "amazon-ebs" "csit_ubuntu_noble_x86_tg" { ssh_timeout = "30m" } -build { - name = "csit_ubuntu_noble_x86_sut-packer" - sources = [ - "source.amazon-ebs.csit_ubuntu_noble_x86_sut" - ] - provisioner "shell" { - inline = var.first_run_commands - } - provisioner "ansible" { - playbook_file = var.ansible_file_path - user = "ubuntu" - use_proxy = false - groups = ["sut_aws"] - extra_arguments = [ - "--extra-vars", "ansible_ssh_pass=${var.ansible_provision_pwd}", - "--extra-vars", "aws=true" - ] - } - provisioner "shell" { - inline = var.last_run_commands - } -} +#build { +# name = "csit_ubuntu_noble_x86_sut-packer" +# sources = [ +# "source.amazon-ebs.csit_ubuntu_noble_x86_sut" +# ] +# provisioner "shell" { +# inline = var.first_run_commands +# } +# provisioner "ansible" { +# playbook_file = var.ansible_file_path +# user = "ubuntu" +# use_proxy = false +# groups = ["sut_aws"] +# extra_arguments = [ +# "--extra-vars", "ansible_ssh_pass=${var.ansible_provision_pwd}", +# "--extra-vars", "aws=true" +# ] +# } +# provisioner "shell" { +# inline = var.last_run_commands +# } +#} build { name = "csit_ubuntu_noble_x86_tg-packer" |