Skip to content

Commit ae9fbca

Browse files
CopilotmnaserfitbeardCopilot
authored
fix(glance_image): use common role for image updates (#3862)
Signed-off-by: Mohammed Naser <mnaser@vexxhost.com> Signed-off-by: Tadas Sutkaitis <tadas.sutkaitis@vexxhost.com> Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: mnaser <435815+mnaser@users.noreply.github.com> Co-authored-by: Mohammed Naser <mnaser@vexxhost.com> Co-authored-by: Tadas Sutkaitis <tadas.sutkaitis@vexxhost.com> Co-authored-by: Copilot <copilot@github.com>
1 parent 6b2e50b commit ae9fbca

15 files changed

Lines changed: 17 additions & 219 deletions

File tree

galaxy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dependencies:
1717
kubernetes.core: 2.4.0
1818
openstack.cloud: ">=2.0.0"
1919
vexxhost.ceph: ">=3.2.0"
20-
atmosphere.common: ">=0.6.0"
20+
atmosphere.common: ">=0.7.0"
2121
vexxhost.kubernetes: ">=2.5.0"
2222
tags:
2323
- application
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
fixes:
3+
- |
4+
Use the ``atmosphere.common.glance_image`` role from
5+
``atmosphere.common`` 0.7.0 instead of Atmosphere's local copy. This
6+
keeps Glance image uploads in sync with source address and HTTP ``ETag``
7+
changes while preserving the safer upload-before-rename behavior for
8+
replacing outdated service images. Atmosphere also removes the unused
9+
local ``qemu_utils`` role because the common role now handles QEMU tooling.

roles/glance/tasks/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
- name: Create images
4040
ansible.builtin.include_role:
41-
name: glance_image
41+
name: atmosphere.common.glance_image
4242
loop: "{{ glance_images }}"
4343
vars:
4444
glance_image_name: "{{ item.name }}"
@@ -47,7 +47,7 @@
4747
glance_image_min_ram: "{{ item.min_ram | default(omit) }}"
4848
glance_image_container_format: "{{ item.container_format | default(omit) }}"
4949
glance_image_disk_format: "{{ item.disk_format | default(omit) }}"
50-
glance_image_properties: "{{ item.properties | default(omit) }}"
50+
glance_image_properties: "{{ item.properties | default({}) }}"
5151
glance_image_kernel: "{{ item.kernel | default(omit) }}"
5252
glance_image_ramdisk: "{{ item.ramdisk | default(omit) }}"
5353
glance_image_is_public: "{{ item.is_public | default(omit) }}"

roles/glance_image/README.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

roles/glance_image/defaults/main.yml

Lines changed: 0 additions & 19 deletions
This file was deleted.

roles/glance_image/meta/main.yml

Lines changed: 0 additions & 34 deletions
This file was deleted.

roles/glance_image/tasks/main.yml

Lines changed: 0 additions & 109 deletions
This file was deleted.

roles/ironic/tasks/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848

4949
- name: Upload images
5050
ansible.builtin.include_role:
51-
name: glance_image
51+
name: atmosphere.common.glance_image
5252
loop:
5353
- name: "{{ ironic_python_agent_deploy_kernel_name }}"
5454
url: "{{ ironic_python_agent_deploy_kernel_url }}"

roles/magnum/tasks/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@
209209

210210
- name: Upload images
211211
ansible.builtin.include_role:
212-
name: glance_image
212+
name: atmosphere.common.glance_image
213213
loop: "{{ magnum_images }}"
214214
vars:
215215
glance_image_name: "{{ item.name }}"

roles/manila/defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ manila_flavor_extra_specs: {}
3535

3636
# Service instance image
3737
manila_image_name: manila-service-image
38-
manila_image_url: "https://object-storage.public.mtl1.vexxhost.net/swift/v1/b98c5fdfb9be4e39a34b93d0b425ac2b/atmosphere-images/manila-{{ atmosphere_version | regex_replace('-beta.','b') }}.qcow2" # noqa yaml[line-length]
38+
manila_image_url: https://github.com/vexxhost/manila-service-images/releases/download/2026.05-3/manila-service-image.qcow2
3939
manila_image_container_format: bare
4040
manila_image_disk_format: qcow2
4141

0 commit comments

Comments
 (0)