aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2020-07-08 13:49:52 +0200
committerMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2020-07-08 13:49:52 +0200
commit81b77b0f28368883a7b1c81fab60824cddc6e6eb (patch)
tree583f1e56f26b57fa8a9c8cfeaae150ec0399a52b
parent4f4b0126a9316b2746306eec86c1224f220aef1c (diff)
downloadkolla-81b77b0f28368883a7b1c81fab60824cddc6e6eb.tar.gz
kolla-81b77b0f28368883a7b1c81fab60824cddc6e6eb.zip
novajoin: install 'freeipa-client' on both Debian and Ubuntu
freeipa-admintools got merged into 'freeipa-client' before Debian 'buster'. Ubuntu 'focal' does not have transitional package so let's fix name before we switch to it. Change-Id: I32f62a763b909da787dee1007055197d6a2dbce1
-rw-r--r--docker/novajoin/novajoin-base/Dockerfile.j24
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/novajoin/novajoin-base/Dockerfile.j2 b/docker/novajoin/novajoin-base/Dockerfile.j2
index 690a75d34..720649f88 100644
--- a/docker/novajoin/novajoin-base/Dockerfile.j2
+++ b/docker/novajoin/novajoin-base/Dockerfile.j2
@@ -26,9 +26,9 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
{% set novajoin_base_packages = [
'ipa-admintools',
] %}
- {% elif base_distro in ['ubuntu'] %}
+ {% elif base_distro in ['debian', 'ubuntu'] %}
{% set novajoin_base_packages = [
- 'freeipa-admintools',
+ 'freeipa-client',
] %}
{% endif %}