diff options
| author | Ahmed Abdelhalim <[email protected]> | 2025-09-22 10:35:32 +0200 |
|---|---|---|
| committer | Ahmed Abdelhalim <[email protected]> | 2025-09-22 10:35:32 +0200 |
| commit | 1d48d7d526c63caf8a08e0bd9972152b9f27c266 (patch) | |
| tree | 4fd98ee38dc55c6888d122b9ccf1daebe507e50b | |
| parent | e584ccf94867d45b22bfa89522e0e00263bf11a2 (diff) | |
Refactor gnome not to pull unnecessary deps (like avahi)
The recommended debian/ubuntu install of gnome pulls avahi-daemon and
that could potentially conflicts with NetworkManager.
Therefore resorting to more restrictive approach for installing gnome
| -rw-r--r-- | molecule/debian/converge.yml | 1 | ||||
| -rw-r--r-- | molecule/raspberrypi/converge.yml | 1 | ||||
| -rw-r--r-- | molecule/ubuntu/converge.yml | 1 | ||||
| -rw-r--r-- | roles/gnome/tasks/install-debian.yml | 5 | ||||
| -rw-r--r-- | roles/gnome/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/gnome/vars/debian.yml | 5 | ||||
| -rw-r--r-- | roles/gnome/vars/ubuntu.yml | 9 |
7 files changed, 20 insertions, 4 deletions
diff --git a/molecule/debian/converge.yml b/molecule/debian/converge.yml index 1000a1c5..e7195e15 100644 --- a/molecule/debian/converge.yml +++ b/molecule/debian/converge.yml @@ -48,3 +48,4 @@ - role: "nginx" - role: "prometheus" - role: "grafana" + - role: "gnome" diff --git a/molecule/raspberrypi/converge.yml b/molecule/raspberrypi/converge.yml index f33e45d8..e7acd5e4 100644 --- a/molecule/raspberrypi/converge.yml +++ b/molecule/raspberrypi/converge.yml @@ -39,3 +39,4 @@ - role: "pihole" - role: "prometheus" - role: "grafana" + - role: "gnome" diff --git a/molecule/ubuntu/converge.yml b/molecule/ubuntu/converge.yml index 6afc2621..acf90b9a 100644 --- a/molecule/ubuntu/converge.yml +++ b/molecule/ubuntu/converge.yml @@ -37,3 +37,4 @@ - role: "nginx" - role: "prometheus" - role: "grafana" + - role: "gnome" diff --git a/roles/gnome/tasks/install-debian.yml b/roles/gnome/tasks/install-debian.yml index eeead556..f00a16c1 100644 --- a/roles/gnome/tasks/install-debian.yml +++ b/roles/gnome/tasks/install-debian.yml @@ -1,11 +1,10 @@ --- - name: "Install gnome packages" become: true - ansible.builtin.package: + ansible.builtin.apt: name: "{{ gnome_packages }}" state: "present" - tags: - - molecule-idempotence-notest + install_recommends: false - name: "Enable GDM display manager" become: true diff --git a/roles/gnome/tasks/main.yml b/roles/gnome/tasks/main.yml index 61562fd4..d1589e6b 100644 --- a/roles/gnome/tasks/main.yml +++ b/roles/gnome/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: "Include OS-specific variables" - ansible.builtin.include_vars: "{{ ansible_os_family | lower }}.yml" + ansible.builtin.include_vars: "{{ ansible_distribution | lower }}.yml" - name: "Include OS-specific tasks" ansible.builtin.include_tasks: "install-{{ ansible_os_family | lower }}.yml" diff --git a/roles/gnome/vars/debian.yml b/roles/gnome/vars/debian.yml index 58039e57..085897ea 100644 --- a/roles/gnome/vars/debian.yml +++ b/roles/gnome/vars/debian.yml @@ -2,3 +2,8 @@ gnome_packages: - "gnome-core" - "gdm3" + - "network-manager-gnome" + - "firefox-esr" + - "gnome-software" + - "packagekit" + - "appstream" diff --git a/roles/gnome/vars/ubuntu.yml b/roles/gnome/vars/ubuntu.yml new file mode 100644 index 00000000..37976324 --- /dev/null +++ b/roles/gnome/vars/ubuntu.yml @@ -0,0 +1,9 @@ +--- +gnome_packages: + - "gnome-core" + - "gdm3" + - "network-manager-gnome" + - "firefox" + - "gnome-software" + - "packagekit" + - "appstream" |