From 535c861d99aa0c07ea130d1f30cabb6af3db7ab7 Mon Sep 17 00:00:00 2001 From: Michal Arbet Date: Wed, 7 Jul 2021 11:41:04 +0200 Subject: [PATCH] Fix missing pacemaker-cli-utils in Debian hacluster images Hacluster-pacemaker images need to have pacemaker cli utils available in all distros and they are provided by pacemaker-cli-utils package in Debuntu systems. Due to a different dependency chain this package is not installed in Debian. This package is also *recommended* dependency of pacemaker and pacemaker-remote in both Debian/Ubuntu systems, but unfortunatelly it is not installed on Debian via APT by default. This patch adding this package to list of package to be installed on Debian/Ubuntu systems for both hacluster-pacemaker (required) and hacluster-pacemaker-remote (to ease with debugging). Closes-Bug: #1934788 Change-Id: I055086ab4af37878e81844f1055bc48d84ae9945 --- docker/hacluster/hacluster-pacemaker-remote/Dockerfile.j2 | 6 ++++++ docker/hacluster/hacluster-pacemaker/Dockerfile.j2 | 6 ++++++ releasenotes/notes/bug-1934788-b1fd51f443479fb6.yaml | 5 +++++ 3 files changed, 17 insertions(+) create mode 100644 releasenotes/notes/bug-1934788-b1fd51f443479fb6.yaml diff --git a/docker/hacluster/hacluster-pacemaker-remote/Dockerfile.j2 b/docker/hacluster/hacluster-pacemaker-remote/Dockerfile.j2 index a5b2f8ab0a..6984269f5d 100644 --- a/docker/hacluster/hacluster-pacemaker-remote/Dockerfile.j2 +++ b/docker/hacluster/hacluster-pacemaker-remote/Dockerfile.j2 @@ -8,6 +8,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} {% set hacluster_pacemaker_remote_packages = ['pacemaker-remote'] %} +{% if base_package_type == 'deb' %} + {% set hacluster_pacemaker_remote_packages = hacluster_pacemaker_remote_packages + [ + 'pacemaker-cli-utils' + ] %} +{% endif %} + {{ macros.install_packages(hacluster_pacemaker_remote_packages | customizable("packages")) }} {% block hacluster_pacemaker_remote_footer %}{% endblock %} diff --git a/docker/hacluster/hacluster-pacemaker/Dockerfile.j2 b/docker/hacluster/hacluster-pacemaker/Dockerfile.j2 index f259aced77..bf01fee744 100644 --- a/docker/hacluster/hacluster-pacemaker/Dockerfile.j2 +++ b/docker/hacluster/hacluster-pacemaker/Dockerfile.j2 @@ -8,6 +8,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} {% set hacluster_pacemaker_packages = ['pacemaker'] %} +{% if base_package_type == 'deb' %} + {% set hacluster_pacemaker_packages = hacluster_pacemaker_packages + [ + 'pacemaker-cli-utils' + ] %} +{% endif %} + {{ macros.install_packages(hacluster_pacemaker_packages | customizable("packages")) }} {% block hacluster_pacemaker_footer %}{% endblock %} diff --git a/releasenotes/notes/bug-1934788-b1fd51f443479fb6.yaml b/releasenotes/notes/bug-1934788-b1fd51f443479fb6.yaml new file mode 100644 index 0000000000..3092a2524b --- /dev/null +++ b/releasenotes/notes/bug-1934788-b1fd51f443479fb6.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Add missing pacemaker cli utils to Debian hacluster images. + `LP#1934788 `__