From: Anil Belur Date: Sat, 2 Dec 2023 13:12:25 +0000 (+1000) Subject: Chore!: Deprecate JSON format var and templates X-Git-Tag: v0.15.2~2 X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=2948466b7ebe2a9f48c15819c3cbd827a4e186ce;p=releng%2Fcommon-packer.git Chore!: Deprecate JSON format var and templates With the release of common-paker v0.14.0 (6e2fdc9fb5be1d9843d14b6a) the packer version v1.9.x supports only HCL format templates and var files. These older JSON format files are no longer used with the packer verify and merge jobs. All packer templates have been migrated from JSON to HCL2 format with v0.14.X release. JSON format templates are deprecated and no longer used with packer version > 1.9.x. Therefore remove the deprecated files from the repository. Change-Id: I95c9a7fa434d57555ecdc8b02af5ef10b70f0ed7 Signed-off-by: Anil Belur --- diff --git a/releasenotes/notes/deprecate-json-format-4dd322d867a7e2b7.yaml b/releasenotes/notes/deprecate-json-format-4dd322d867a7e2b7.yaml new file mode 100644 index 0000000..d361d5e --- /dev/null +++ b/releasenotes/notes/deprecate-json-format-4dd322d867a7e2b7.yaml @@ -0,0 +1,15 @@ +--- +deprecations: + - | + Deprecate JSON format var and templates + + With the release of common-paker v0.14.0 (commit 6e2fdc9fb5be1d9843d14b6a) + the packer version v1.9.x supports only HCL format templates and var files. + These older JSON format files are no longer used with the packer + verify and merge jobs. + + All packer templates have been migrated from JSON to HCL2 format + with v0.14.X release. + + JSON format templates are deprecated and no longer used with packer + version > 1.9.x. Therefore remove the deprecated files from the repository. diff --git a/templates/builder-aws.json b/templates/builder-aws.json deleted file mode 100644 index 9add5db..0000000 --- a/templates/builder-aws.json +++ /dev/null @@ -1,74 +0,0 @@ -{ - "description": "Build an AMI for use as a CI builder", - "variables": { - "ansible_roles_path": ".galaxy", - "arch": "x86_64", - "aws_instance_type": "t2.micro", - "aws_region": "us-west-2", - "aws_access_key": null, - "aws_secret_key": null, - "cloud_user_data": null, - "distro": null, - "security_group_id": null, - "source_ami_filter_name": null, - "source_ami_filter_owner": null, - "source_ami_filter_product_code": null, - "subnet_id": null, - "ssh_user": null, - "ssh_proxy_host": "", - "vpc_id": null - }, - "builders": [ - { - "name": "aws", - "access_key": "{{user `aws_access_key`}}", - "ami_name": "ZZCI - {{user `distro`}} - builder-aws - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}", - "instance_type": "{{user `aws_instance_type`}}", - "region": "{{user `aws_region`}}", - "secret_key": "{{user `aws_secret_key`}}", - "security_group_id": "{{user `security_group_id`}}", - "source_ami_filter": { - "filters": { - "name": "{{user `source_ami_filter_name`}}", - "product-code": "{{user `source_ami_filter_product_code`}}", - "root-device-type": "ebs", - "virtualization-type": "hvm" - }, - "most_recent": true, - "owners": ["{{user `source_ami_filter_owner`}}"] - }, - "ssh_username": "{{user `ssh_user`}}", - "ssh_proxy_host": "{{user `ssh_proxy_host`}}", - "vpc_id": "{{user `vpc_id`}}", - "subnet_id": "{{user `subnet_id`}}", - "type": "amazon-ebs", - "user_data_file": "{{user `cloud_user_data`}}" - } - ], - "provisioners": [ - { - "type": "shell", - "scripts": ["common-packer/provision/install-python.sh"], - "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi" - }, - { - "type": "shell-local", - "command": "./common-packer/ansible-galaxy.sh {{user `ansible_roles_path`}}" - }, - { - "type": "ansible", - "user": "{{user `ssh_user`}}", - "command": "./common-packer/ansible-playbook.sh", - "skip_version_check": true, - "playbook_file": "provision/local-builder.yaml", - "ansible_env_vars": [ - "ANSIBLE_NOCOWS=1", - "ANSIBLE_PIPELINING=False", - "ANSIBLE_HOST_KEY_CHECKING=False", - "ANSIBLE_ROLES_PATH={{user `ansible_roles_path`}}", - "ANSIBLE_CALLBACK_WHITELIST=profile_tasks", - "ANSIBLE_STDOUT_CALLBACK=debug" - ] - } - ] -} diff --git a/templates/builder.json b/templates/builder.json deleted file mode 100644 index 4e516ec..0000000 --- a/templates/builder.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "variables": { - "ansible_roles_path": ".galaxy", - "arch": "x86_64", - "base_image": null, - "cloud_network": null, - "cloud_user_data": null, - "cloud_region": "ca-ymq-1", - "vm_use_block_storage": "true", - "vm_volume_size": "20", - "vm_image_disk_format": "", - "distro": null, - "docker_source_image": null, - "flavor": "v2-highcpu-1", - "ssh_user": null, - "ssh_proxy_host": "" - }, - "builders": [ - { - "name": "openstack", - "image_name": "ZZCI - {{user `distro`}} - builder - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}", - "instance_name": "{{user `distro`}}-builder-{{uuid}}", - "source_image_name": "{{user `base_image`}}", - "type": "openstack", - "region": "{{user `cloud_region`}}", - "networks": ["{{user `cloud_network`}}"], - "user_data_file": "{{user `cloud_user_data`}}", - "ssh_username": "{{user `ssh_user`}}", - "ssh_proxy_host": "{{user `ssh_proxy_host`}}", - "flavor": "{{user `flavor`}}", - "metadata": { - "ci_managed": "yes" - }, - "use_blockstorage_volume": "{{user `vm_use_block_storage`}}", - "volume_size": "{{user `vm_volume_size`}}", - "image_disk_format": "{{user `vm_image_disk_format`}}" - }, - { - "name": "docker", - "type": "docker", - "image": "{{ user `docker_source_image` }}", - "commit": true, - "changes": ["ENTRYPOINT [\"\"]", "CMD [\"\"]"] - } - ], - "provisioners": [ - { - "type": "shell", - "scripts": ["common-packer/provision/install-python.sh"], - "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi" - }, - { - "type": "shell-local", - "command": "./common-packer/ansible-galaxy.sh {{user `ansible_roles_path`}}" - }, - { - "type": "ansible", - "command": "./common-packer/ansible-playbook.sh", - "skip_version_check": true, - "playbook_file": "provision/local-builder.yaml", - "ansible_env_vars": [ - "ANSIBLE_NOCOWS=1", - "ANSIBLE_PIPELINING=True", - "ANSIBLE_ROLES_PATH={{user `ansible_roles_path`}}", - "ANSIBLE_CALLBACK_WHITELIST=profile_tasks", - "ANSIBLE_STDOUT_CALLBACK=debug" - ] - } - ] -} diff --git a/templates/devstack-pre-pip-yoga.json b/templates/devstack-pre-pip-yoga.json deleted file mode 100644 index 9b59681..0000000 --- a/templates/devstack-pre-pip-yoga.json +++ /dev/null @@ -1,75 +0,0 @@ -{ - "variables": { - "ansible_roles_path": ".galaxy", - "arch": "x86_64", - "base_image": null, - "cloud_network": null, - "cloud_user_data": null, - "cloud_region": "ca-ymq-1", - "vm_use_block_storage": "true", - "vm_volume_size": "20", - "vm_image_disk_format": "", - "distro": null, - "docker_source_image": null, - "flavor": "v3-standard-2", - "ssh_user": null, - "ssh_proxy_host": "" - }, - "builders": [ - { - "name": "openstack", - "image_name": "ZZCI - {{user `distro`}} - devstack-yoga - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}", - "instance_name": "{{user `distro`}}-devstack-yoga-{{uuid}}", - "source_image_name": "{{user `base_image`}}", - "type": "openstack", - "region": "{{user `cloud_region`}}", - "networks": ["{{user `cloud_network`}}"], - "user_data_file": "{{user `cloud_user_data`}}", - "ssh_username": "{{user `ssh_user`}}", - "ssh_proxy_host": "{{user `ssh_proxy_host`}}", - "flavor": "{{user `flavor`}}", - "metadata": { - "ci_managed": "yes" - }, - "use_blockstorage_volume": "{{user `vm_use_block_storage`}}", - "volume_size": "{{user `vm_volume_size`}}", - "image_disk_format": "{{user `vm_image_disk_format`}}" - }, - { - "name": "docker", - "type": "docker", - "image": "{{ user `docker_source_image` }}", - "commit": true, - "changes": ["ENTRYPOINT [\"\"]", "CMD [\"\"]"] - } - ], - "provisioners": [ - { - "type": "shell", - "scripts": ["common-packer/provision/install-python.sh"], - "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi" - }, - { - "type": "shell-local", - "command": "./common-packer/ansible-galaxy.sh {{user `ansible_roles_path`}}" - }, - { - "type": "ansible", - "playbook_file": "provision/devstack-pre-pip-centos.yaml", - "command": "./common-packer/ansible-playbook.sh", - "skip_version_check": true, - "ansible_env_vars": [ - "ANSIBLE_DEBUG=False", - "ANSIBLE_NOCOWS=1", - "ANSIBLE_PIPELINING=True", - "ANSIBLE_ROLES_PATH={{user `ansible_roles_path`}}", - "ANSIBLE_CALLBACK_WHITELIST=profile_tasks", - "ANSIBLE_STDOUT_CALLBACK=debug" - ], - "extra_arguments": [ - "--extra-vars", - "os_branch=stable/yoga rdo_branch=yoga" - ] - } - ] -} diff --git a/templates/devstack.json b/templates/devstack.json deleted file mode 100644 index 98a1f13..0000000 --- a/templates/devstack.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "variables": { - "ansible_roles_path": ".galaxy", - "arch": "x86_64", - "base_image": null, - "cloud_network": null, - "cloud_user_data": null, - "cloud_region": "ca-ymq-1", - "vm_use_block_storage": "true", - "vm_volume_size": "20", - "vm_image_disk_format": "", - "distro": null, - "docker_source_image": null, - "flavor": "v3-standard-2", - "ssh_user": null, - "ssh_proxy_host": "" - }, - "builders": [ - { - "name": "openstack", - "image_name": "ZZCI - {{user `distro`}} - devstack - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}", - "instance_name": "{{user `distro`}}-devstack-{{uuid}}", - "source_image_name": "{{user `base_image`}}", - "type": "openstack", - "region": "{{user `cloud_region`}}", - "networks": ["{{user `cloud_network`}}"], - "user_data_file": "{{user `cloud_user_data`}}", - "ssh_username": "{{user `ssh_user`}}", - "ssh_proxy_host": "{{user `ssh_proxy_host`}}", - "flavor": "{{user `flavor`}}", - "metadata": { - "ci_managed": "yes" - }, - "use_blockstorage_volume": "{{user `vm_use_block_storage`}}", - "volume_size": "{{user `vm_volume_size`}}", - "image_disk_format": "{{user `vm_image_disk_format`}}" - }, - { - "name": "docker", - "type": "docker", - "image": "{{ user `docker_source_image` }}", - "commit": true, - "changes": ["ENTRYPOINT [\"\"]", "CMD [\"\"]"] - } - ], - "provisioners": [ - { - "type": "shell", - "scripts": ["common-packer/provision/install-python.sh"], - "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi" - }, - { - "type": "shell-local", - "command": "./common-packer/ansible-galaxy.sh {{user `ansible_roles_path`}}" - }, - { - "type": "ansible", - "playbook_file": "provision/devstack.yaml", - "command": "./common-packer/ansible-playbook.sh", - "skip_version_check": true, - "ansible_env_vars": [ - "ANSIBLE_NOCOWS=1", - "ANSIBLE_PIPELINING=True", - "ANSIBLE_ROLES_PATH={{user `ansible_roles_path`}}", - "ANSIBLE_CALLBACK_WHITELIST=profile_tasks", - "ANSIBLE_STDOUT_CALLBACK=debug" - ] - } - ] -} diff --git a/templates/docker-aws.json b/templates/docker-aws.json deleted file mode 100644 index 17642ec..0000000 --- a/templates/docker-aws.json +++ /dev/null @@ -1,74 +0,0 @@ -{ - "description": "Build an AMI for use as a CI builder", - "variables": { - "ansible_roles_path": ".galaxy", - "arch": "x86_64", - "aws_instance_type": "t2.micro", - "aws_region": "us-west-2", - "aws_access_key": null, - "aws_secret_key": null, - "cloud_user_data": null, - "distro": null, - "security_group_id": null, - "source_ami_filter_name": null, - "source_ami_filter_owner": null, - "source_ami_filter_product_code": null, - "subnet_id": null, - "ssh_user": null, - "ssh_proxy_host": "", - "vpc_id": null - }, - "builders": [ - { - "name": "aws", - "access_key": "{{user `aws_access_key`}}", - "ami_name": "ZZCI - {{user `distro`}} - docker-aws - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}", - "instance_type": "{{user `aws_instance_type`}}", - "region": "{{user `aws_region`}}", - "secret_key": "{{user `aws_secret_key`}}", - "security_group_id": "{{user `security_group_id`}}", - "source_ami_filter": { - "filters": { - "name": "{{user `source_ami_filter_name`}}", - "product-code": "{{user `source_ami_filter_product_code`}}", - "root-device-type": "ebs", - "virtualization-type": "hvm" - }, - "most_recent": true, - "owners": ["{{user `source_ami_filter_owner`}}"] - }, - "ssh_username": "{{user `ssh_user`}}", - "ssh_proxy_host": "{{user `ssh_proxy_host`}}", - "vpc_id": "{{user `vpc_id`}}", - "subnet_id": "{{user `subnet_id`}}", - "type": "amazon-ebs", - "user_data_file": "{{user `cloud_user_data`}}" - } - ], - "provisioners": [ - { - "type": "shell", - "scripts": ["common-packer/provision/install-python.sh"], - "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi" - }, - { - "type": "shell-local", - "command": "./common-packer/ansible-galaxy.sh {{user `ansible_roles_path`}}" - }, - { - "type": "ansible", - "user": "{{user `ssh_user`}}", - "command": "./common-packer/ansible-playbook.sh", - "skip_version_check": true, - "playbook_file": "provision/local-docker.yaml", - "ansible_env_vars": [ - "ANSIBLE_NOCOWS=1", - "ANSIBLE_PIPELINING=False", - "ANSIBLE_HOST_KEY_CHECKING=False", - "ANSIBLE_ROLES_PATH={{user `ansible_roles_path`}}", - "ANSIBLE_CALLBACK_WHITELIST=profile_tasks", - "ANSIBLE_STDOUT_CALLBACK=debug" - ] - } - ] -} diff --git a/templates/docker.json b/templates/docker.json deleted file mode 100644 index 6e28785..0000000 --- a/templates/docker.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "variables": { - "ansible_roles_path": ".galaxy", - "arch": "x86_64", - "base_image": null, - "cloud_network": null, - "cloud_user_data": null, - "cloud_region": "ca-ymq-1", - "vm_use_block_storage": "true", - "vm_volume_size": "20", - "vm_image_disk_format": "", - "distro": null, - "docker_source_image": null, - "flavor": "v2-highcpu-1", - "ssh_user": null, - "ssh_proxy_host": "" - }, - "builders": [ - { - "name": "openstack", - "image_name": "ZZCI - {{user `distro`}} - docker - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}", - "instance_name": "{{user `distro`}}-docker-{{uuid}}", - "source_image_name": "{{user `base_image`}}", - "type": "openstack", - "region": "{{user `cloud_region`}}", - "networks": ["{{user `cloud_network`}}"], - "user_data_file": "{{user `cloud_user_data`}}", - "ssh_username": "{{user `ssh_user`}}", - "ssh_proxy_host": "{{user `ssh_proxy_host`}}", - "flavor": "{{user `flavor`}}", - "metadata": { - "ci_managed": "yes" - }, - "use_blockstorage_volume": "{{user `vm_use_block_storage`}}", - "volume_size": "{{user `vm_volume_size`}}", - "image_disk_format": "{{user `vm_image_disk_format`}}" - }, - { - "name": "docker", - "type": "docker", - "image": "{{ user `docker_source_image` }}", - "commit": true, - "changes": ["ENTRYPOINT [\"\"]", "CMD [\"\"]"] - } - ], - "provisioners": [ - { - "type": "shell", - "scripts": ["common-packer/provision/install-python.sh"], - "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi" - }, - { - "type": "shell-local", - "command": "./common-packer/ansible-galaxy.sh {{user `ansible_roles_path`}}" - }, - { - "type": "ansible", - "command": "./common-packer/ansible-playbook.sh", - "skip_version_check": true, - "playbook_file": "provision/local-docker.yaml", - "ansible_env_vars": [ - "ANSIBLE_NOCOWS=1", - "ANSIBLE_PIPELINING=True", - "ANSIBLE_ROLES_PATH={{user `ansible_roles_path`}}", - "ANSIBLE_CALLBACK_WHITELIST=profile_tasks", - "ANSIBLE_STDOUT_CALLBACK=debug" - ] - } - ] -} diff --git a/templates/windows-builder.json b/templates/windows-builder.json deleted file mode 100644 index f0e5758..0000000 --- a/templates/windows-builder.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "variables": { - "ansible_roles_path": ".galaxy", - "arch": "x86_64", - "base_image": null, - "cloud_network": null, - "cloud_user_data": null, - "cloud_region": "ca-ymq-1", - "vm_use_block_storage": "true", - "vm_volume_size": "20", - "vm_image_disk_format": "", - "distro": null, - "flavor": "v2-highcpu-4" - }, - "builders": [ - { - "name": "openstack", - "image_name": "ZZCI - {{user `distro`}} - win-builder - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}", - "instance_name": "{{user `distro`}}-win-builder-{{uuid}}", - "source_image_name": "{{user `base_image`}}", - "type": "openstack", - "region": "{{user `cloud_region`}}", - "networks": ["{{user `cloud_network`}}"], - "user_data_file": "{{user `cloud_user_data`}}", - "flavor": "{{user `flavor`}}", - "metadata": { - "ci_managed": "yes" - }, - "use_blockstorage_volume": "{{user `vm_use_block_storage`}}", - "volume_size": "{{user `vm_volume_size`}}", - "image_disk_format": "{{user `vm_image_disk_format`}}", - "communicator": "winrm", - "winrm_insecure": true, - "winrm_use_ssl": true, - "winrm_timeout": "3600s", - "winrm_username": "Administrator", - "winrm_password": "W!nRMB00tStrap." - } - ], - "provisioners": [ - { - "type": "ansible", - "playbook_file": "provision/local-windows-builder.yaml", - "extra_arguments": [ - "--connection", - "packer", - "--extra-vars", - "ansible_shell_type=powershell ansible_shell_executable=None" - ] - } - ] -} diff --git a/vars/centos-7-arm64.json b/vars/centos-7-arm64.json deleted file mode 100644 index 923495e..0000000 --- a/vars/centos-7-arm64.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "arch": "arm64", - "base_image": "CentOS 7.8 (aarch64) [2020-04-22]", - "cloud_user_data": "common-packer/provision/rh-user_data.sh", - "distro": "CentOS 7", - "docker_source_image": "arm64v8/centos:7", - "flavor": "v3-standard-2", - "source_ami_filter_name": "*CentOS 7*aarch64*", - "source_ami_filter_owner": "aws-marketplace", - "source_ami_filter_product_code": "6zber5dti4jyo9khb62tg49o8", - "ssh_user": "centos" -} diff --git a/vars/centos-7.json b/vars/centos-7.json deleted file mode 100644 index 4580acb..0000000 --- a/vars/centos-7.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "source_ami_filter_name": "*CentOS-7*", - "source_ami_filter_owner": "aws-marketplace", - "source_ami_filter_product_code": "cvugziknvmxgqna9noibqnnsy", - "base_image": "CentOS 7-x86_64 [2020-04-22]", - "distro": "CentOS 7", - "docker_source_image": "centos:7", - "ssh_user": "centos", - "cloud_user_data": "common-packer/provision/rh-user_data.sh" -} diff --git a/vars/centos-8.json b/vars/centos-8.json deleted file mode 100644 index 1f05970..0000000 --- a/vars/centos-8.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "source_ami_filter_name": "*CentOS-8*", - "source_ami_filter_owner": "aws-marketplace", - "source_ami_filter_product_code": "47k9ia2igxpcce2bzo8u3kj03", - "base_image": "CentOS 8.2 (x86_64) [2020-06-11]", - "distro": "CentOS 8", - "docker_source_image": "centos:8", - "ssh_user": "centos", - "cloud_user_data": "common-packer/provision/rh-user_data.sh" -} diff --git a/vars/centos-cs-8.json b/vars/centos-cs-8.json deleted file mode 100644 index a764e5f..0000000 --- a/vars/centos-cs-8.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "source_ami_filter_name": "*CentOS-cs-8*", - "source_ami_filter_owner": "aws-marketplace", - "source_ami_filter_product_code": "0418c980c296f36ce", - "base_image": "CentOS Stream 8 (x86_64) [2022-01-25]", - "distro": "CentOS Stream 8", - "docker_source_image": "centos:8", - "ssh_user": "centos", - "cloud_user_data": "common-packer/provision/rh-user_data.sh" -} diff --git a/vars/centos-cs-9.json b/vars/centos-cs-9.json deleted file mode 100644 index 2ea783b..0000000 --- a/vars/centos-cs-9.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "source_ami_filter_name": "*CentOS-cs-9*", - "source_ami_filter_owner": "aws-marketplace", - "source_ami_filter_product_code": "0454011e44daf8e6d", - "base_image": "CentOS Stream 9 (x86_64) [2022-02-24]", - "distro": "CentOS Stream 9", - "docker_source_image": "centos:9", - "ssh_user": "cloud-user", - "cloud_user_data": "common-packer/provision/rh-user_data.sh" -} diff --git a/vars/ubuntu-16.04-arm64.json b/vars/ubuntu-16.04-arm64.json deleted file mode 100644 index ea877a0..0000000 --- a/vars/ubuntu-16.04-arm64.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "arch": "arm64", - "base_image": "Ubuntu 16.04 LTS (arm64) [2020-03-11]", - "cloud_user_data": "common-packer/provision/ubuntu-user_data.sh", - "distro": "Ubuntu 16.04", - "docker_source_image": "arm64v8/ubuntu:16.04", - "flavor": "v3-standard-2", - "source_ami_filter_name": "*ubuntu*16.04*", - "source_ami_filter_owner": "aws-marketplace", - "source_ami_filter_product_code": "7x1es1d2cyv0hf36v5nqpcp32", - "ssh_user": "ubuntu" -} diff --git a/vars/ubuntu-16.04.json b/vars/ubuntu-16.04.json deleted file mode 100644 index 0c69a53..0000000 --- a/vars/ubuntu-16.04.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "source_ami_filter_name": "ubuntu/images/*ubuntu-xenial-16.04-amd64-server*", - "source_ami_filter_owner": "aws-marketplace", - "source_ami_filter_product_code": "csv6h7oyg29b7epjzg7qdr7no", - "base_image": "LF - Ubuntu 16.04 LTS (2019-12-11)", - "distro": "Ubuntu 16.04", - "docker_source_image": "ubuntu:16.04", - "ssh_user": "ubuntu", - "cloud_user_data": "common-packer/provision/ubuntu-user_data.sh" -} diff --git a/vars/ubuntu-18.04-arm64.json b/vars/ubuntu-18.04-arm64.json deleted file mode 100644 index 5a36adc..0000000 --- a/vars/ubuntu-18.04-arm64.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "arch": "arm64", - "base_image": "Ubuntu 18.04.6 LTS (aarch64) [2021-09-28]", - "cloud_user_data": "common-packer/provision/ubuntu-user_data.sh", - "distro": "Ubuntu 18.04", - "docker_source_image": "arm64v8/ubuntu:18.04", - "flavor": "v3-standard-2", - "source_ami_filter_name": "*ubuntu*18.04*", - "source_ami_filter_owner": "aws-marketplace", - "source_ami_filter_product_code": "zud1u4kjmxu2j2jf0n36beqt", - "ssh_user": "ubuntu" -} diff --git a/vars/ubuntu-18.04.json b/vars/ubuntu-18.04.json deleted file mode 100644 index 27cfef8..0000000 --- a/vars/ubuntu-18.04.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "source_ami_filter_name": "ubuntu/images/*ubuntu-bionic-18.04-amd64-server-*", - "source_ami_filter_owner": "aws-marketplace", - "source_ami_filter_product_code": "3iplms73etrdhxdepv72l6ywj", - "base_image": "Ubuntu 18.04 LTS [2022-04-11]", - "distro": "Ubuntu 18.04", - "docker_source_image": "ubuntu:18.04", - "ssh_user": "ubuntu", - "cloud_user_data": "common-packer/provision/ubuntu-user_data.sh" -} diff --git a/vars/ubuntu-20.04-arm64.json b/vars/ubuntu-20.04-arm64.json deleted file mode 100644 index e6ff491..0000000 --- a/vars/ubuntu-20.04-arm64.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "arch": "arm64", - "base_image": "Ubuntu 20.04.3 LTS (aarch64) [2021-10-04]", - "cloud_user_data": "common-packer/provision/ubuntu-user_data.sh", - "distro": "Ubuntu 20.04", - "docker_source_image": "arm64v8/ubuntu:20.04", - "flavor": "v3-standard-2", - "source_ami_filter_name": "*ubuntu*20.04*", - "source_ami_filter_owner": "aws-marketplace", - "source_ami_filter_product_code": "3j3t5wgc6orwshxai7wk5sux9", - "ssh_user": "ubuntu" -} diff --git a/vars/ubuntu-20.04.json b/vars/ubuntu-20.04.json deleted file mode 100644 index 4b4bf2d..0000000 --- a/vars/ubuntu-20.04.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "source_ami_filter_name": "*ubuntu*20.04*", - "source_ami_filter_owner": "aws-marketplace", - "source_ami_filter_product_code": "a8jyynf4hjutohctm41o2z18m", - "base_image": "Ubuntu 20.04 LTS [2022-04-11]", - "distro": "Ubuntu 20.04", - "docker_source_image": "ubuntu:20.04", - "ssh_user": "ubuntu", - "cloud_user_data": "common-packer/provision/ubuntu-user_data.sh" -} diff --git a/vars/windows-server-2016.json b/vars/windows-server-2016.json deleted file mode 100644 index 53b3842..0000000 --- a/vars/windows-server-2016.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "source_ami_filter_name": "", - "source_ami_filter_owner": "", - "source_ami_filter_product_code": "", - "base_image": "Windows Server Standard 2016 [2017-02-20]", - "distro": "Windows 2016", - "docker_source_image": "windows:2016", - "ssh_user": "admin", - "cloud_user_data": "common-packer/provision/windows-user_data.ps1" -}