Skip to content

Commit fbdfc2d

Browse files
authored
Merge pull request #1555 from swordqiu/hotfix/qj-add-qemu-10.0.7
feature: install yunion-qemu-10.0.7 for win11
2 parents 0e18712 + ac14cd1 commit fbdfc2d

File tree

4 files changed

+18
-1
lines changed

4 files changed

+18
-1
lines changed

onecloud/roles/common/tasks/main.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,14 @@
3939
- common_packages is defined
4040
- onecloud_version is version('v4.0', '>=')
4141

42+
- name: Append qemu_10_packages to common_packages after version 4.0
43+
set_fact:
44+
common_packages: "{{ common_packages + qemu_10_packages }}"
45+
when:
46+
- qemu_10_packages is defined
47+
- common_packages is defined
48+
- onecloud_version is version('v4.0', '>=')
49+
4250
# onecloud/roles/common/tasks/
4351
- name: "Import OS Arch tasks Common 6 ({{ ansible_distribution }} {{ ansible_distribution_major_version }} {{ ansible_architecture }})"
4452
include_tasks: "{{ item }}"

onecloud/roles/utils/detect-os/tasks/main.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,12 @@
127127
- containerd_packages is not defined
128128
- 'enable_containerd|default(false) == true'
129129

130+
- name: gather var for qemu 10.x packages
131+
include_vars: "../vars/qemu_10_packages.yml"
132+
when:
133+
- qemu_10_packages is not defined
134+
- onecloud_version is version('v4.0', '>=')
135+
130136
- name: gather var for win11 packages
131137
include_vars: "../vars/win11_packages.yml"
132138
when:
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
qemu_10_packages:
3+
- yunion-qemu-10.0.7
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
---
22
win11_packages:
33
- yunion-secbootovmf
4-
- yunion-swtpm
4+
- yunion-swtpm

0 commit comments

Comments
 (0)