diff options
| author | Michal Arbet <michal.arbet@ultimum.io> | 2021-07-07 11:41:04 +0200 |
|---|---|---|
| committer | Michal Arbet <michal.arbet@ultimum.io> | 2021-07-30 13:26:39 +0200 |
| commit | 535c861d99aa0c07ea130d1f30cabb6af3db7ab7 (patch) | |
| tree | 84f07b4b3b5557e9347db5ab4ff5cddc78a25ff2 /docker | |
| parent | 5e0b238b01250392fa9f92c069a7253902d6b325 (diff) | |
| download | kolla-535c861d99aa0c07ea130d1f30cabb6af3db7ab7.tar.gz kolla-535c861d99aa0c07ea130d1f30cabb6af3db7ab7.zip | |
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
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/hacluster/hacluster-pacemaker-remote/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | docker/hacluster/hacluster-pacemaker/Dockerfile.j2 | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/docker/hacluster/hacluster-pacemaker-remote/Dockerfile.j2 b/docker/hacluster/hacluster-pacemaker-remote/Dockerfile.j2 index a5b2f8ab0..6984269f5 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 f259aced7..bf01fee74 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 %} |