Skip to content

Commit

Permalink
Merge pull request #266 from stackhpc/upstream/2023.1-2024-04-08
Browse files Browse the repository at this point in the history
Synchronise 2023.1 with upstream
  • Loading branch information
markgoddard authored Apr 8, 2024
2 parents 90e62ed + 018448f commit c0deb71
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion playbooks/kayobe-infra-vm-base/overrides.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ infra_vm_memory_mb: "{{ 1 * 1024 }}"

# Use cirros rather than CentOS for the VM.
infra_vm_bootstrap_user: cirros
infra_vm_root_image: /opt/cache/files/cirros-0.5.2-x86_64-disk.img
infra_vm_root_image: /opt/cache/files/cirros-0.5.3-x86_64-disk.img

# Cirros doesn't load cdom drivers by default.
vm_configdrive_device: disk
Expand Down
2 changes: 1 addition & 1 deletion playbooks/kayobe-seed-vm-base/overrides.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ seed_vm_memory_mb: "{{ 1 * 1024 }}"

# Use cirros rather than CentOS for the VM.
seed_bootstrap_user: cirros
seed_vm_root_image: /opt/cache/files/cirros-0.5.2-x86_64-disk.img
seed_vm_root_image: /opt/cache/files/cirros-0.5.3-x86_64-disk.img

# Cirros doesn't load cdom drivers by default.
seed_vm_configdrive_device: disk
Expand Down

0 comments on commit c0deb71

Please sign in to comment.