From 9fe4ff55db58c1e54b79f39c056233e498298bfa Mon Sep 17 00:00:00 2001 From: Lee Goolsbee Date: Sat, 12 Jul 2025 13:43:45 -0500 Subject: [PATCH 1/2] ITPLT-4441 install google-noto-fonts-all metapackage instead of wildcard on package name --- roles/confluence_config/tasks/amazon-2023_fonts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/confluence_config/tasks/amazon-2023_fonts.yml b/roles/confluence_config/tasks/amazon-2023_fonts.yml index e2535dd..a7fcd2d 100644 --- a/roles/confluence_config/tasks/amazon-2023_fonts.yml +++ b/roles/confluence_config/tasks/amazon-2023_fonts.yml @@ -3,7 +3,7 @@ - name: Install Google Noto fonts for language coverage ansible.builtin.dnf: name: - - "google-noto-*" + - "google-noto-fonts-all" - name: Link the language fonts into the JDK # Not idiomatic, but cleaner than messing with nested lookups... From 34456ef433e6757b251ccc231fc15b415afd27fc Mon Sep 17 00:00:00 2001 From: Lee Goolsbee Date: Sat, 12 Jul 2025 14:04:29 -0500 Subject: [PATCH 2/2] ITPLT-4441 use a rescue block to install the metapackage, and if it doesn't exist, install all noto packages via wildcard --- roles/confluence_config/tasks/amazon-2023_fonts.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/roles/confluence_config/tasks/amazon-2023_fonts.yml b/roles/confluence_config/tasks/amazon-2023_fonts.yml index a7fcd2d..1906514 100644 --- a/roles/confluence_config/tasks/amazon-2023_fonts.yml +++ b/roles/confluence_config/tasks/amazon-2023_fonts.yml @@ -1,9 +1,15 @@ --- - name: Install Google Noto fonts for language coverage - ansible.builtin.dnf: - name: - - "google-noto-fonts-all" + block: + - name: Try to install google-noto-fonts-all package + ansible.builtin.dnf: + name: + - "google-noto-fonts-all" + rescue: + - name: Install individual google-noto packages if meta package not available + ansible.builtin.dnf: + name: "google-noto-*" - name: Link the language fonts into the JDK # Not idiomatic, but cleaner than messing with nested lookups...