diff --git a/packer.conf b/packer.conf index 789f330..e45e368 100644 --- a/packer.conf +++ b/packer.conf @@ -60,8 +60,6 @@ builders = [ } ena_support = "true" sriov_support = "true" - ami_groups = "{{user `ami_access`}}" - ami_regions = "{{user `ami_regions`}}" } ] diff --git a/profiles/alpine.conf b/profiles/alpine.conf index 6c488bb..eca7f55 100644 --- a/profiles/alpine.conf +++ b/profiles/alpine.conf @@ -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 diff --git a/profiles/base/1 b/profiles/base/1 index 18decd1..666e5d4 100644 --- a/profiles/base/1 +++ b/profiles/base/1 @@ -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}" diff --git a/profiles/test.conf b/profiles/test.conf index 6d8d2e0..085f8cc 100644 --- a/profiles/test.conf +++ b/profiles/test.conf @@ -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 diff --git a/scripts/builder.py b/scripts/builder.py index c5f33be..08c0fa7 100755 --- a/scripts/builder.py +++ b/scripts/builder.py @@ -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,