From ec333103e122633c471cf238f632effab4935e11 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Fri, 28 Apr 2017 08:50:03 +0200 Subject: [PATCH] Always add zuul group to zuul user Not all distros - like openSUSE - create a separate group for each user. Be explicit when creating zuul user like in nodepool/elements/jenkins-slave/install.d/20-jenkins-slave. Code later assumes that user and group are both named zuul, so we need to set the specific zuul group. Also, set /bin/bash as root shell following a similar change for jenkins done in Ic671b7c5344a1e7980bede88bee730b50764e60b to keep these two invocations in sync. Change-Id: Iec8de3c0799aa023ace8f172f84bf8a137d0967b --- nodepool/elements/zuul-worker/install.d/60-zuul-worker | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nodepool/elements/zuul-worker/install.d/60-zuul-worker b/nodepool/elements/zuul-worker/install.d/60-zuul-worker index ef10d06810..ab2f00e78e 100755 --- a/nodepool/elements/zuul-worker/install.d/60-zuul-worker +++ b/nodepool/elements/zuul-worker/install.d/60-zuul-worker @@ -6,7 +6,11 @@ fi set -eu set -o pipefail -useradd -m zuul +# Add zuul user and group. Note we don't want to rely on +# "useradd"'s group adding behaviour, because it might differ across +# distros. +groupadd zuul +useradd -m zuul -g zuul -s /bin/bash cat > /etc/sudoers.d/zuul << EOF zuul ALL=(ALL) NOPASSWD:ALL