Skip to content

add variables for custom source AMI owner, ssh interface, IAM profile, and subnet #654

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
pjaudiomv wants to merge 1 commit into
base: main
Choose a base branch
from
+64 −32
Open

add variables for custom source AMI owner, ssh interface, IAM profile, and subnet #654

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
18 changes: 10 additions & 8 deletions al2023.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,19 @@ source "amazon-ebs" "al2023" {
filters = {
name = "${var.source_ami_al2023}"
}
owners = ["amazon"]
owners = var.source_ami_owners
most_recent = true
include_deprecated = true
}
ami_ou_arns = "${var.ami_ou_arns}"
ami_org_arns = "${var.ami_org_arns}"
ami_users = "${var.ami_users}"
ssh_interface = "public_ip"
ssh_username = "ec2-user"
tags = "${local.merged_tags}"
run_tags = "${var.run_tags}"
ami_ou_arns = "${var.ami_ou_arns}"
ami_org_arns = "${var.ami_org_arns}"
ami_users = "${var.ami_users}"
ssh_interface = "${var.ssh_interface}"
ssh_username = "ec2-user"
iam_instance_profile = "${var.iam_instance_profile}"
subnet_id = "${var.subnet_id}"
tags = "${local.merged_tags}"
run_tags = "${var.run_tags}"
}

build {
Expand Down
18 changes: 10 additions & 8 deletions al2023arm.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,17 @@ source "amazon-ebs" "al2023arm" {
filters = {
name = "${var.source_ami_al2023arm}"
}
owners = ["amazon"]
owners = var.source_ami_owners
most_recent = true
include_deprecated = true
}
ami_ou_arns = "${var.ami_ou_arns}"
ami_org_arns = "${var.ami_org_arns}"
ami_users = "${var.ami_users}"
ssh_interface = "public_ip"
ssh_username = "ec2-user"
tags = "${local.merged_tags_al2023arm}"
run_tags = "${var.run_tags}"
ami_ou_arns = "${var.ami_ou_arns}"
ami_org_arns = "${var.ami_org_arns}"
ami_users = "${var.ami_users}"
ssh_interface = "${var.ssh_interface}"
ssh_username = "ec2-user"
iam_instance_profile = "${var.iam_instance_profile}"
subnet_id = "${var.subnet_id}"
tags = "${local.merged_tags_al2023arm}"
run_tags = "${var.run_tags}"
}
18 changes: 10 additions & 8 deletions al2023gpu.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,17 @@ source "amazon-ebs" "al2023gpu" {
filters = {
name = "${var.source_ami_al2023}"
}
owners = ["amazon"]
owners = var.source_ami_owners
most_recent = true
include_deprecated = true
}
ami_ou_arns = "${var.ami_ou_arns}"
ami_org_arns = "${var.ami_org_arns}"
ami_users = "${var.ami_users}"
ssh_interface = "public_ip"
ssh_username = "ec2-user"
tags = "${local.merged_tags_al2023gpu}"
run_tags = "${var.run_tags}"
ami_ou_arns = "${var.ami_ou_arns}"
ami_org_arns = "${var.ami_org_arns}"
ami_users = "${var.ami_users}"
ssh_interface = "${var.ssh_interface}"
ssh_username = "ec2-user"
iam_instance_profile = "${var.iam_instance_profile}"
subnet_id = "${var.subnet_id}"
tags = "${local.merged_tags_al2023gpu}"
run_tags = "${var.run_tags}"
}
18 changes: 10 additions & 8 deletions al2023neu.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,17 @@ source "amazon-ebs" "al2023neu" {
filters = {
name = "${var.source_ami_al2023}"
}
owners = ["amazon"]
owners = var.source_ami_owners
most_recent = true
include_deprecated = true
}
ami_ou_arns = "${var.ami_ou_arns}"
ami_org_arns = "${var.ami_org_arns}"
ami_users = "${var.ami_users}"
ssh_interface = "public_ip"
ssh_username = "ec2-user"
tags = "${local.merged_tags_al2023neu}"
run_tags = "${var.run_tags}"
ami_ou_arns = "${var.ami_ou_arns}"
ami_org_arns = "${var.ami_org_arns}"
ami_users = "${var.ami_users}"
ssh_interface = "${var.ssh_interface}"
ssh_username = "ec2-user"
iam_instance_profile = "${var.iam_instance_profile}"
subnet_id = "${var.subnet_id}"
tags = "${local.merged_tags_al2023neu}"
run_tags = "${var.run_tags}"
}
24 changes: 24 additions & 0 deletions variables.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,30 @@ variable "source_ami_al2023arm" {
description = "Amazon Linux 2023 ARM source AMI to build from."
}

variable "source_ami_owners" {
type = list(string)
description = "Accounts to search when filtering source AMIs. Defaults to Amazon-owned AMIs."
default = ["amazon"]
}

variable "ssh_interface" {
type = string
description = "SSH interface for the build instance."
default = "public_ip"
}

variable "iam_instance_profile" {
type = string
description = "IAM instance profile to attach to the build instance. Required when ssh_interface is 'session_manager'."
default = null
}

variable "subnet_id" {
type = string
description = "VPC subnet ID for the build instance. Must support the connectivity method specified by 'ssh_interface'."
default = null
}

variable "kernel_version_al2023" {
type = string
description = "Amazon Linux 2023 kernel version."
Expand Down