Remove release vars from packer

This commit is contained in:
Mike Crute 2020-05-28 12:47:59 -07:00
parent b804d174b3
commit 812eba9597
5 changed files with 1 additions and 19 deletions

View File

@ -60,8 +60,6 @@ builders = [
}
ena_support = "true"
sriov_support = "true"
ami_groups = "{{user `ami_access`}}"
ami_regions = "{{user `ami_regions`}}"
}
]

View File

@ -11,14 +11,7 @@ arch-x86_64 { include required("arch/x86_64") }
alpine {
ami_desc_suffix = " - https://github.com/mcrute/alpine-ec2-ami"
build_region = "us-west-2"
build_subnet = "subnet-b80c36e2"
ami_access {
all = true # these AMIs are publicly available
}
ami_regions {
ALL = true
}
}
# Build definitions

View File

@ -16,7 +16,7 @@ arch = null
build_arch = null
# Builder-instance
build_region = null
build_region = "us-west-2"
build_subnet = null
build_instance_type = "t3.nano"
build_public_ip = null
@ -33,8 +33,6 @@ ami_desc_suffix = ""
ami_volume_size = "1"
ami_encrypt = "false"
ami_user = "alpine" # modification currently not supported
ami_access = {}
ami_regions = {}
# NOTE: the following are python format strings, resolved in resolve-profile.py
ami_name = "{var.ami_name_prefix}{var.release}-{var.arch}-{var.revision}{var.ami_name_suffix}"
ami_desc = "{var.ami_desc_prefix}{var.release} {var.arch} {var.revision}{var.ami_desc_suffix}"

View File

@ -12,11 +12,6 @@ arch-aarch64 { include required("arch/aarch64") }
test {
ami_name_prefix = "test-"
ami_desc_prefix = "Alpine Test "
build_region = "us-west-2"
build_subnet = "subnet-00c202262d97c0536"
# ami_regions {
# ap-east-1 = true
# }
}
# Build definitions

View File

@ -487,8 +487,6 @@ class ConfigBuilder:
self.out_dir = out_dir
self._keys_to_transform = {
"ami_access" : self.fold_comma,
"ami_regions" : self.fold_comma,
"kernel_modules" : self.fold_comma,
"kernel_options" : self.fold_space,
"repos" : self.fold_repos,