From a6bb726d7f267350603999afa378b5f4742941f1 Mon Sep 17 00:00:00 2001 From: HVSharma12 Date: Fri, 5 Jan 2024 20:20:39 +0530 Subject: [PATCH 1/3] ci: Add ALP-Dolomite var file --- tasks/setup-zypper.yml | 21 +++++++++++++++++++++ vars/ALP-Dolomite.yml | 22 ++++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 tasks/setup-zypper.yml create mode 100644 vars/ALP-Dolomite.yml diff --git a/tasks/setup-zypper.yml b/tasks/setup-zypper.yml new file mode 100644 index 0000000..ea6b298 --- /dev/null +++ b/tasks/setup-zypper.yml @@ -0,0 +1,21 @@ +--- +- name: If choosing custom package set, ensure minimal cockpit is included + set_fact: + cockpit_packages: "{{ cockpit_packages + __cockpit_packages_minimal + if cockpit_packages not in __cockpit_package_types + else cockpit_packages }}" + when: cockpit_packages is defined + +- name: Ensure Cockpit Web Console packages are installed. + zypper: + name: "{{ __cockpit_packages[cockpit_packages] + if cockpit_packages in __cockpit_package_types + else cockpit_packages }}" + state: present + +- name: Reboot system + reboot: + when: ansible_distribution == 'ALP-Dolomite' + +- name: Flush handlers + meta: flush_handlers diff --git a/vars/ALP-Dolomite.yml b/vars/ALP-Dolomite.yml new file mode 100644 index 0000000..d179954 --- /dev/null +++ b/vars/ALP-Dolomite.yml @@ -0,0 +1,22 @@ +--- +__cockpit_packages_minimal: + - cockpit-system + - cockpit-ws +__cockpit_packages_default: + - cockpit-bridge + - cockpit-networkmanager + - cockpit-selinux + - cockpit-storaged +__cockpit_packages_full: + - cockpit-bridge + - cockpit-machines + - cockpit-networkmanager + - cockpit-podman + - cockpit-selinux + - cockpit-storaged + - cockpit-tukit +__cockpit_packages: + minimal: "{{ __cockpit_packages_minimal }}" + default: "{{ __cockpit_packages_minimal + __cockpit_packages_default }}" + full: "{{ __cockpit_packages_minimal + __cockpit_packages_default + + __cockpit_packages_full }}" From 8912c35180498ca38f5fe50ca96580dcd3effc52 Mon Sep 17 00:00:00 2001 From: HVSharma12 Date: Sat, 6 Jan 2024 08:09:40 +0530 Subject: [PATCH 2/3] remove redundant task --- tasks/setup-zypper.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/tasks/setup-zypper.yml b/tasks/setup-zypper.yml index ea6b298..3d0a072 100644 --- a/tasks/setup-zypper.yml +++ b/tasks/setup-zypper.yml @@ -16,6 +16,3 @@ - name: Reboot system reboot: when: ansible_distribution == 'ALP-Dolomite' - -- name: Flush handlers - meta: flush_handlers From 858f7139a0c803b0a0d34d44cded6ba9b1f57ff3 Mon Sep 17 00:00:00 2001 From: HVSharma12 Date: Sun, 7 Jan 2024 21:54:17 +0530 Subject: [PATCH 3/3] Update collection requirements --- meta/collection-requirements.yml | 1 + tasks/setup-zypper.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/collection-requirements.yml b/meta/collection-requirements.yml index 0e6f8ea..26e594f 100644 --- a/meta/collection-requirements.yml +++ b/meta/collection-requirements.yml @@ -2,4 +2,5 @@ --- collections: - ansible.posix + - community.general - fedora.linux_system_roles diff --git a/tasks/setup-zypper.yml b/tasks/setup-zypper.yml index 3d0a072..7ac26ef 100644 --- a/tasks/setup-zypper.yml +++ b/tasks/setup-zypper.yml @@ -7,7 +7,7 @@ when: cockpit_packages is defined - name: Ensure Cockpit Web Console packages are installed. - zypper: + community.general.zypper: name: "{{ __cockpit_packages[cockpit_packages] if cockpit_packages in __cockpit_package_types else cockpit_packages }}"