From 838c66e611aa864cd67e36ff7ed6fc5d4adce795 Mon Sep 17 00:00:00 2001 From: Eric Ball Date: Mon, 29 Jul 2024 14:14:48 -0700 Subject: [PATCH] Chore: Update common-packer to latest, v0.16.5 Change-Id: I4b79d17c651130c786b2219e1e5a051d4fafeca9 Signed-off-by: Eric Ball --- packer/common-packer | 2 +- packer/templates/builder.json | 1 - packer/templates/builder.pkr.hcl | 1 + packer/templates/docker.json | 1 - packer/templates/docker.pkr.hcl | 1 + packer/templates/helm.json | 61 ---------------------------------------- 6 files changed, 3 insertions(+), 64 deletions(-) delete mode 120000 packer/templates/builder.json create mode 120000 packer/templates/builder.pkr.hcl delete mode 120000 packer/templates/docker.json create mode 120000 packer/templates/docker.pkr.hcl delete mode 100644 packer/templates/helm.json diff --git a/packer/common-packer b/packer/common-packer index 15aba27..8177cb7 160000 --- a/packer/common-packer +++ b/packer/common-packer @@ -1 +1 @@ -Subproject commit 15aba27a45f98edb33890daa3712c6a4371b2947 +Subproject commit 8177cb744aac4e16194b3fb9e271cdec8ffe0693 diff --git a/packer/templates/builder.json b/packer/templates/builder.json deleted file mode 120000 index bd227be..0000000 --- a/packer/templates/builder.json +++ /dev/null @@ -1 +0,0 @@ -../common-packer/templates/builder.json \ No newline at end of file diff --git a/packer/templates/builder.pkr.hcl b/packer/templates/builder.pkr.hcl new file mode 120000 index 0000000..8ea2d87 --- /dev/null +++ b/packer/templates/builder.pkr.hcl @@ -0,0 +1 @@ +../common-packer/templates/builder.pkr.hcl \ No newline at end of file diff --git a/packer/templates/docker.json b/packer/templates/docker.json deleted file mode 120000 index edea6d2..0000000 --- a/packer/templates/docker.json +++ /dev/null @@ -1 +0,0 @@ -../common-packer/templates/docker.json \ No newline at end of file diff --git a/packer/templates/docker.pkr.hcl b/packer/templates/docker.pkr.hcl new file mode 120000 index 0000000..08567df --- /dev/null +++ b/packer/templates/docker.pkr.hcl @@ -0,0 +1 @@ +../common-packer/templates/docker.pkr.hcl \ No newline at end of file diff --git a/packer/templates/helm.json b/packer/templates/helm.json deleted file mode 100644 index 3518e73..0000000 --- a/packer/templates/helm.json +++ /dev/null @@ -1,61 +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": "30", - "vm_image_disk_format": "", - "distro": null, - "flavor": "v1-standard-1", - "ssh_user": null, - "ssh_proxy_host": "" - }, - "builders": [ - { - "name": "vexxhost", - "image_name": "ZZCI - {{user `distro`}} - helm - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}", - "instance_name": "{{user `distro`}}-builder-{{uuid}}", - "source_image_name": "{{user `base_image`}}", - "type": "openstack", - "region": "{{user `cloud_region`}}", - "availability_zone": "{{user `cloud_availability_zone`}}", - "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`}}" - } - ], - "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/helm.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" - ] - } - ] -} -- 2.16.6