diff options
Diffstat (limited to 'fdio.infra.packer')
| -rw-r--r-- | fdio.infra.packer/aws_c5n/ubuntu_focal.pkr.hcl | 128 | ||||
| -rw-r--r-- | fdio.infra.packer/aws_c6gn/ubuntu_jammy.pkr.hcl (renamed from fdio.infra.packer/aws_c6gn/ubuntu_focal.pkr.hcl) | 20 |
2 files changed, 10 insertions, 138 deletions
diff --git a/fdio.infra.packer/aws_c5n/ubuntu_focal.pkr.hcl b/fdio.infra.packer/aws_c5n/ubuntu_focal.pkr.hcl deleted file mode 100644 index 06d849abb3..0000000000 --- a/fdio.infra.packer/aws_c5n/ubuntu_focal.pkr.hcl +++ /dev/null @@ -1,128 +0,0 @@ -packer { - required_plugins { - amazon = { - version = ">= 1.0.1" - source = "github.com/hashicorp/amazon" - } - } -} - -variable "first_run_commands" { - description = "Commands to run before deployment via remote-exec" - type = list(string) - default = [ - "" - ] -} - -variable "last_run_commands" { - description = "Commands to run after deployment via remote-exec" - type = list(string) - default = [ - "sudo sed -i 's/Unattended-Upgrade \"1\"/Unattended-Upgrade \"0\"/g' /etc/apt/apt.conf.d/20auto-upgrades" - ] -} - -variable "ansible_file_path" { - description = "Path to Ansible playbook" - type = string - default = "../../fdio.infra.ansible/site.yaml" -} - -variable "ansible_python_executable" { - description = "Path to Python interpreter" - type = string - default = "/usr/bin/python3" -} - -variable "ansible_topology_path" { - description = "Path to Ansible playbook which creates a topology file" - type = string - default = "../../fdio.infra.ansible/cloud_topology.yaml" -} - -variable "ansible_provision_pwd" { - description = "Password used for ansible provisioning (ansible_ssh_pass)" - type = string - default = "Csit1234" -} - -source "amazon-ebs" "csit_c5n_ubuntu_focal_sut" { - ami_name = "csit_c5n_ubuntu_focal_sut" - ami_description = "CSIT SUT image based on Ubuntu Focal" - ena_support = true - instance_type = "c5n.4xlarge" - launch_block_device_mappings { - device_name = "/dev/sda1" - volume_size = 40 - volume_type = "gp2" - } - force_deregister = true - region = "eu-central-1" - skip_create_ami = false - source_ami = "ami-0a875db8a031a9efb" - ssh_username = "ubuntu" -} - -source "amazon-ebs" "csit_c5n_ubuntu_focal_tg" { - ami_name = "csit_c5n_ubuntu_focal_tg" - ami_description = "CSIT TG image based on Ubuntu Focal" - ena_support = true - instance_type = "c5n.4xlarge" - launch_block_device_mappings { - device_name = "/dev/sda1" - volume_size = 40 - volume_type = "gp2" - } - force_deregister = true - region = "eu-central-1" - skip_create_ami = false - source_ami = "ami-0a875db8a031a9efb" - ssh_username = "ubuntu" -} - -build { - name = "csit_c5n_ubuntu_focal_sut-packer" - sources = [ - "source.amazon-ebs.csit_c5n_ubuntu_focal_sut" - ] - provisioner "shell" { - inline = var.first_run_commands - } - provisioner "ansible" { - playbook_file = var.ansible_file_path - user = "ubuntu" - groups = ["sut_aws"] - extra_arguments = [ - "--extra-vars", "ansible_ssh_pass=${var.ansible_provision_pwd}", - "--extra-vars", "ansible_python_interpreter=${var.ansible_python_executable}", - "--extra-vars", "aws=true" - ] - } - provisioner "shell" { - inline = var.last_run_commands - } -} - -build { - name = "csit_c5n_ubuntu_focal_tg-packer" - sources = [ - "source.amazon-ebs.csit_c5n_ubuntu_focal_tg" - ] - provisioner "shell" { - inline = var.first_run_commands - } - provisioner "ansible" { - playbook_file = var.ansible_file_path - user = "ubuntu" - groups = ["tg_aws"] - extra_arguments = [ - "--extra-vars", "ansible_ssh_pass=${var.ansible_provision_pwd}", - "--extra-vars", "ansible_python_interpreter=${var.ansible_python_executable}", - "--extra-vars", "aws=true" - ] - } - provisioner "shell" { - inline = var.last_run_commands - } -} diff --git a/fdio.infra.packer/aws_c6gn/ubuntu_focal.pkr.hcl b/fdio.infra.packer/aws_c6gn/ubuntu_jammy.pkr.hcl index 42cbb39443..db2ce0c6e6 100644 --- a/fdio.infra.packer/aws_c6gn/ubuntu_focal.pkr.hcl +++ b/fdio.infra.packer/aws_c6gn/ubuntu_jammy.pkr.hcl @@ -41,9 +41,9 @@ variable "ansible_provision_pwd" { type = string default = "Csit1234" } -source "amazon-ebs" "csit_c6gn_ubuntu_focal_sut" { - ami_name = "csit_c6gn_ubuntu_focal_sut" - ami_description = "CSIT SUT image based on Ubuntu Focal" +source "amazon-ebs" "csit_c6gn_ubuntu_jammy_sut" { + ami_name = "csit_c6gn_ubuntu_jammy_sut" + ami_description = "CSIT SUT image based on Ubuntu jammy" ena_support = true instance_type = "c6gn.4xlarge" launch_block_device_mappings { @@ -57,9 +57,9 @@ source "amazon-ebs" "csit_c6gn_ubuntu_focal_sut" { source_ami = "ami-0a875db8a031a9efb" ssh_username = "ubuntu" } -source "amazon-ebs" "csit_c6gn_ubuntu_focal_tg" { - ami_name = "csit_c6gn_ubuntu_focal_tg" - ami_description = "CSIT TG image based on Ubuntu Focal" +source "amazon-ebs" "csit_c6gn_ubuntu_jammy_tg" { + ami_name = "csit_c6gn_ubuntu_jammy_tg" + ami_description = "CSIT TG image based on Ubuntu jammy" ena_support = true instance_type = "c6gn.4xlarge" launch_block_device_mappings { @@ -74,9 +74,9 @@ source "amazon-ebs" "csit_c6gn_ubuntu_focal_tg" { ssh_username = "ubuntu" } build { - name = "csit_c6gn_ubuntu_focal_sut-packer" + name = "csit_c6gn_ubuntu_jammy_sut-packer" sources = [ - "source.amazon-ebs.csit_c6gn_ubuntu_focal_sut" + "source.amazon-ebs.csit_c6gn_ubuntu_jammy_sut" ] provisioner "shell" { inline = var.first_run_commands @@ -96,9 +96,9 @@ build { } } build { - name = "csit_c6gn_ubuntu_focal_tg-packer" + name = "csit_c6gn_ubuntu_jammy_tg-packer" sources = [ - "source.amazon-ebs.csit_c6gn_ubuntu_focal_tg" + "source.amazon-ebs.csit_c6gn_ubuntu_jammy_tg" ] provisioner "shell" { inline = var.first_run_commands |