aboutsummaryrefslogtreecommitdiff
path: root/docker/kolla-toolbox
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2022-09-29 16:23:12 +0000
committerGerrit Code Review <review@openstack.org>2022-09-29 16:23:12 +0000
commit66e9a4dc34c21ceab59d6afa8d23019e936eedb1 (patch)
tree676b243e6bb76915f4ff947300c55bc3c57c9349 /docker/kolla-toolbox
parent4a94fb4d16da2f9e666cfd9dede38d1719bdf795 (diff)
parentac1ae843862ed7b39e953bfc5a9208b6ceb70b2a (diff)
downloadkolla-66e9a4dc34c21ceab59d6afa8d23019e936eedb1.tar.gz
kolla-66e9a4dc34c21ceab59d6afa8d23019e936eedb1.zip
Merge "centos: use Erlang 24 on AArch64"
Diffstat (limited to 'docker/kolla-toolbox')
-rw-r--r--docker/kolla-toolbox/Dockerfile.j220
1 files changed, 13 insertions, 7 deletions
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2
index 20822738b..db29c24e2 100644
--- a/docker/kolla-toolbox/Dockerfile.j2
+++ b/docker/kolla-toolbox/Dockerfile.j2
@@ -13,17 +13,23 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='ansible') }}
{{ macros.configure_user(name='rabbitmq') }}
-{% if base_arch == 'aarch64' %}
-{{ macros.enable_extra_repos(['epel']) }}
-{% endif %}
-
{{ macros.enable_extra_repos(['crb', 'erlang', 'openvswitch', 'rabbitmq']) }}
{% if base_package_type == 'rpm' %}
- {% set kolla_toolbox_packages = [
+ {# NOTE(hrw): we do not have Erlang 25 packages for AArch64 yet. #}
+ {% if base_arch == 'aarch64' %}
+ {% set kolla_toolbox_packages = [
+ 'erlang-24.*',
+ ] %}
+ {% else %}
+ {% set kolla_toolbox_packages = [
+ 'erlang-25.*',
+ ] %}
+ {% endif %}
+
+ {% set kolla_toolbox_packages = kolla_toolbox_packages + [
'crudini',
- 'erlang-24.*',
'gcc',
'gdisk',
'git',
@@ -36,7 +42,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'openssl-devel',
'openvswitch',
'python3-devel',
- 'rabbitmq-server-3.9.*'
+ 'rabbitmq-server-3.10.*'
] %}
{% elif base_package_type == 'deb' %}