aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-07-09 20:47:54 +0000
committerGerrit Code Review <review@openstack.org>2020-07-09 20:47:54 +0000
commit198986c51fcefef7da5c76f89400101084452ebb (patch)
tree2cb4c3fe484d5e760290c98894be25491e526937
parentefb11c1ef64eb779066e054793131b590866ac86 (diff)
parent81b77b0f28368883a7b1c81fab60824cddc6e6eb (diff)
downloadkolla-198986c51fcefef7da5c76f89400101084452ebb.tar.gz
kolla-198986c51fcefef7da5c76f89400101084452ebb.zip
Merge "novajoin: install 'freeipa-client' on both Debian and Ubuntu"
-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 %}