aligning arch templates and bumping k3os version (rancher#601)

package/packer/openstack/template-arm64.json

@@ -1,49 +1,51 @@
 {
- "variables": {
- "os_source_image_id": "{{env `OS_SOURCE_IMAGE`}}",
- "os_network_id": "{{env `OS_NETWORK_ID`}}",
- "os_floating_ip_pool": "{{env `OS_FLOATING_IP_POOL`}}",
- "os_flavor": "{{env `OS_FLAVOR`}}",
- "k3os_version": "v0.11.0",
- "iso_url": "https://github.com/rancher/k3os/releases/download/v0.11.0/k3os-arm64.iso"
- },
  "builders": [
  {
- "type": "openstack",
- "flavor": "2",
- "ssh_username": "ubuntu",
- "image_name": "k3OS-{{user `k3os_version`}}-arm64",
- "source_image": "{{user `os_source_image_id`}}",
- "networks": "{{user `os_network_id`}}",
- "floating_ip_pool": "{{user `os_floating_ip_pool`}}",
- "use_floating_ip": true,
- "security_groups": ["default"]
+ "flavor": "{{user `os_flavor`}}",
+ "floating_ip_pool": "{{user `os_floating_ip_pool`}}",
+ "image_name": "k3OS-{{user `k3os_version`}}-arm64",
+ "networks": "{{user `os_network_id`}}",
+ "security_groups": [
+ "default"
+ ],
+ "source_image": "{{user `os_source_image_id`}}",
+ "ssh_username": "ubuntu",
+ "type": "openstack",
+ "use_floating_ip": true
  }
  ],
  "provisioners": [
  {
- "type": "file",
+ "destination": "/tmp/config.yaml",
  "source": "./config.yaml",
- "destination": "/tmp/config.yaml"
+ "type": "file"
  },
  {
- "type": "file",
+ "destination": "/tmp/",
  "source": "../../../install.sh",
- "destination": "/tmp/"
+ "type": "file"
  },
  {
- "type": "shell",
  "inline": [
  "sudo apt-get update -y",
  "sudo apt-get install -y dosfstools parted",
- "sudo bash -x /tmp/install.sh --takeover --debug --tty ttyS0 --config /tmp/config.yaml --no-format $(findmnt / -o SOURCE -n) \"{{user `iso_url`}}\" && sync"
- ]
+ "sudo bash -x /tmp/install.sh --takeover --debug --tty ttyS0 --config /tmp/config.yaml --no-format $(findmnt / -o SOURCE -n) \"{{user `iso_url`}}\" \u0026\u0026 sync"
+ ],
+ "type": "shell"
  },
  {
- "type": "shell",
  "inline": [
  "set -x; sudo systemd-run --on-active=3 --timer-property=AccuracySec=100ms sudo systemctl reboot --force --force; sync; echo Rebooting"
- ]
+ ],
+ "type": "shell"
  }
- ]
+ ],
+ "variables": {
+ "iso_url": "https://github.com/rancher/k3os/releases/download/v0.11.1/k3os-arm64.iso",
+ "k3os_version": "v0.11.1",
+ "os_flavor": "{{env `OS_FLAVOR`}}",
+ "os_floating_ip_pool": "{{env `OS_FLOATING_IP_POOL`}}",
+ "os_network_id": "{{env `OS_NETWORK_ID`}}",
+ "os_source_image_id": "{{env `OS_SOURCE_IMAGE`}}"
+ }
 }

package/packer/openstack/template.json

@@ -41,8 +41,8 @@
  }
  ],
  "variables": {
- "iso_url": "https://github.com/rancher/k3os/releases/download/v0.11.0/k3os-amd64.iso",
- "k3os_version": "v0.11.0",
+ "iso_url": "https://github.com/rancher/k3os/releases/download/v0.11.1/k3os-amd64.iso",
+ "k3os_version": "v0.11.1",
  "os_flavor": "{{env `OS_FLAVOR`}}",
  "os_floating_ip_pool": "{{env `OS_FLOATING_IP_POOL`}}",
  "os_network_id": "{{env `OS_NETWORK_ID`}}",