Skip to content

Commit 855dcb5

Browse files
authored
Merge pull request #1509 from swordqiu/hotfix/qj-ovmf-deb-package
fix: yunion-ovmfrpm deb package
2 parents 3bdef1b + 980a2ca commit 855dcb5

File tree

7 files changed

+6
-13
lines changed

7 files changed

+6
-13
lines changed

onecloud/roles/common/tasks/os/debian_family.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,5 @@
9898
when:
9999
- selinux_conf_exists.stat.exists
100100

101-
- name: Import task utils/fix_ovmf_path
102-
include_tasks: utils/fix_ovmf_path.yml
103-
104101
- name: Import task utils/config_iptables.yml
105102
include_tasks: utils/config_iptables.yml
106-
107-
- name: Import task utils/fix_ovmf_path
108-
include_tasks: utils/fix_ovmf_path.yml
109-

onecloud/roles/utils/detect-os/vars/debian-aarch64.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ common_packages:
2020
- nfs-common
2121
- chrony
2222
- openvswitch-switch
23-
- ovmf
2423
- parallel
2524
- python3-selinux
2625
- python3-setuptools
2726
- "{{ yunion_qemu_package }}"
2827
- yunion-executor
28+
- yunion-ovmfrpm
2929

3030
common_services:
3131
- ntp

onecloud/roles/utils/detect-os/vars/debian-x86_64.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ common_packages:
2020
- nfs-common
2121
- chrony
2222
- openvswitch-switch
23-
- ovmf
2423
- parallel
2524
- python3-selinux
2625
- python3-setuptools
2726
- "{{ yunion_qemu_package }}"
2827
- yunion-executor
28+
- yunion-ovmfrpm
2929

3030
common_services:
3131
- ntp

onecloud/roles/utils/detect-os/vars/ubuntu-20.x86_64.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ common_packages:
2121
- nfs-common
2222
- ntp
2323
- openvswitch-switch
24-
- ovmf
2524
- parallel
2625
- python3-selinux
2726
- software-properties-common
2827
- "{{ yunion_qemu_package }}"
28+
- yunion-ovmfrpm
2929

3030
common_services:
3131
- ntp

onecloud/roles/utils/detect-os/vars/ubuntu-22.x86_64.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ common_packages:
2121
- nfs-common
2222
- ntp
2323
- openvswitch-switch
24-
- ovmf
2524
- parallel
2625
- python3-selinux
2726
- software-properties-common
2827
- "{{ yunion_qemu_package }}"
28+
- yunion-ovmfrpm
2929

3030
common_services:
3131
- ntp

onecloud/roles/utils/detect-os/vars/ubuntu-aarch64.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ common_packages:
2121
- nfs-common
2222
- chrony
2323
- openvswitch-switch
24-
- ovmf
2524
- parallel
2625
- python3-selinux
2726
- software-properties-common
2827
- "{{ yunion_qemu_package }}"
28+
- yunion-ovmfrpm
2929

3030
common_services:
3131
- chrony

onecloud/roles/utils/detect-os/vars/ubuntu-x86_64.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ common_packages:
2121
- nfs-common
2222
- chrony
2323
- openvswitch-switch
24-
- ovmf
2524
- parallel
2625
- python3-selinux
2726
- software-properties-common
2827
- "{{ yunion_qemu_package }}"
28+
- yunion-ovmfrpm
2929

3030
common_services:
3131
- chrony

0 commit comments

Comments
 (0)