summaryrefslogtreecommitdiff
path: root/docker/base/Dockerfile.j2
diff options
context:
space:
mode:
authorMichal Arbet <michal.arbet@ultimum.io>2021-07-28 11:48:17 +0200
committerMichal Arbet <michal.arbet@ultimum.io>2021-08-05 16:48:31 +0200
commit20d8b83ecb99669caf501cd54a38eaa8ffebb0bd (patch)
treec0ce7960c608f2e5873ecb94751c710d057a9c04 /docker/base/Dockerfile.j2
parent65684250175117b47d41e29d1bc3f9116c0084b5 (diff)
downloadkolla-20d8b83ecb99669caf501cd54a38eaa8ffebb0bd.tar.gz
kolla-20d8b83ecb99669caf501cd54a38eaa8ffebb0bd.zip
base/deb: bump 'system' groups limit beyond Kolla ones
Pacemaker complains that group 'haclient' already exists during installation and is not 'system group'. So let bump range for 'system' groups to make it happier. Our images do not have normal groups so it should not affect. Partial-Bug: #1934753 Change-Id: I4a79815f4e19d82fa77341672cd26d2282800f6a
Diffstat (limited to 'docker/base/Dockerfile.j2')
-rw-r--r--docker/base/Dockerfile.j210
1 files changed, 7 insertions, 3 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 7c771dd50..23c62385b 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -236,10 +236,14 @@ RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("cen
{# endif for base_package_type rpm #}
{% elif base_package_type == 'deb' %}
# Customize PS1 bash shell
-# enlarge 'system users' range so 'haproxy' package will not complain
-# see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=939470
+# - enlarge 'system users' range so 'haproxy' package will not complain
+# see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=939470
+# - enlarge 'system groups' range so 'hacluster' user added in
+# https://review.opendev.org/c/openstack/kolla/+/802671
+# can be in 'haclient' group with same high uid
RUN cat /tmp/kolla_bashrc >> /etc/bash.bashrc \
- && sed -i -e s/LAST_SYSTEM_UID=999/LAST_SYSTEM_UID=59999/g /etc/adduser.conf
+ && sed -i -e s/LAST_SYSTEM_UID=999/LAST_SYSTEM_UID=59999/g \
+ -e s/LAST_SYSTEM_GID=999/LAST_SYSTEM_GID=59999/g /etc/adduser.conf
# This will prevent questions from being asked during the install
ENV DEBIAN_FRONTEND noninteractive