From 0e33c5f68e131b3e63241461829f543b7ce7357b Mon Sep 17 00:00:00 2001 From: gregharvey Date: Thu, 23 Nov 2023 15:08:31 +0100 Subject: [PATCH 1/3] Adding extra packages to common_base. --- roles/_meta/common_base/meta/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/_meta/common_base/meta/main.yml b/roles/_meta/common_base/meta/main.yml index 938863506..9e6fc7aef 100644 --- a/roles/_meta/common_base/meta/main.yml +++ b/roles/_meta/common_base/meta/main.yml @@ -1,6 +1,6 @@ --- dependencies: - - { role: apt_extra_packages, apt_extra_packages: ["rsync", "python3-apt", "acl", "gnupg", "build-essential", "cron", "bsd-mailx"] } + - { role: apt_extra_packages, apt_extra_packages: ["rsync", "python3-apt", "acl", "gnupg", "build-essential", "cron", "bsd-mailxi", "dnsutils", "telnet", "atop", "sysstat"] } - role: locales - role: user_root - role: apt_extra_packages From 1c5dc57a0499ecb83fbf1c3f3847d7b8eb921091 Mon Sep 17 00:00:00 2001 From: gregharvey Date: Thu, 23 Nov 2023 15:10:21 +0100 Subject: [PATCH 2/3] Fixing typo. --- roles/_meta/common_base/meta/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/_meta/common_base/meta/main.yml b/roles/_meta/common_base/meta/main.yml index 9e6fc7aef..119d34190 100644 --- a/roles/_meta/common_base/meta/main.yml +++ b/roles/_meta/common_base/meta/main.yml @@ -1,6 +1,6 @@ --- dependencies: - - { role: apt_extra_packages, apt_extra_packages: ["rsync", "python3-apt", "acl", "gnupg", "build-essential", "cron", "bsd-mailxi", "dnsutils", "telnet", "atop", "sysstat"] } + - { role: apt_extra_packages, apt_extra_packages: ["rsync", "python3-apt", "acl", "gnupg", "build-essential", "cron", "bsd-mailx", "dnsutils", "telnet", "atop", "sysstat"] } - role: locales - role: user_root - role: apt_extra_packages From 1d50257bf9b4c7d075672d930aeccf1b6f57d635 Mon Sep 17 00:00:00 2001 From: gregharvey Date: Fri, 24 Nov 2023 19:05:55 +0100 Subject: [PATCH 3/3] Removing diagnostic packages from containers. --- .gitignore | 1 + roles/_meta/common_base/meta/main.yml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 609ae422a..aac4f84cb 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /test.yml /ce-dev/ansible/plays/provision-target/indexer /roles/contrib +/docs/roles/contrib diff --git a/roles/_meta/common_base/meta/main.yml b/roles/_meta/common_base/meta/main.yml index 119d34190..ce0c462e7 100644 --- a/roles/_meta/common_base/meta/main.yml +++ b/roles/_meta/common_base/meta/main.yml @@ -1,6 +1,7 @@ --- dependencies: - - { role: apt_extra_packages, apt_extra_packages: ["rsync", "python3-apt", "acl", "gnupg", "build-essential", "cron", "bsd-mailx", "dnsutils", "telnet", "atop", "sysstat"] } + - { role: apt_extra_packages, apt_extra_packages: ["rsync", "python3-apt", "acl", "gnupg", "build-essential", "cron", "bsd-mailx"] } + - { role: apt_extra_packages, apt_extra_packages: ["dnsutils", "telnet", "atop", "sysstat"], when: ( is_local is not defined or not is_local ) } - role: locales - role: user_root - role: apt_extra_packages