Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions onecloud/roles/common/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,14 @@
- online_status == 'offline'
- primary_master_node_ip is defined

- name: Append win11_packages to common_packages if win11_packages is defined
set_fact:
common_packages: "{{ common_packages + win11_packages }}"
when:
- win11_packages is defined
- common_packages is defined
- onecloud_version is version('v4.0', '>=')

# onecloud/roles/common/tasks/
- name: "Import OS Arch tasks Common 6 ({{ ansible_distribution }} {{ ansible_distribution_major_version }} {{ ansible_architecture }})"
include_tasks: "{{ item }}"
Expand Down
8 changes: 8 additions & 0 deletions onecloud/roles/utils/detect-os/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,16 @@
- name: gather var for containerd packages
include_vars: "../vars/containerd_packages.yml"
when:
- containerd_packages is not defined
- 'enable_containerd|default(false) == true'

- name: gather var for win11 packages
include_vars: "../vars/win11_packages.yml"
when:
- win11_packages is not defined
- ansible_architecture == 'x86_64'
- onecloud_version is version('v4.0', '>=')

- name: Append K8s packages if needed
set_fact:
common_packages: "{{ common_packages + k8s_packages + ['yunion-ocadm'] }}"
Expand Down
4 changes: 4 additions & 0 deletions onecloud/roles/utils/detect-os/vars/win11_packages.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
win11_packages:
- yunion-secbootovmf
- yunion-swtpm