File tree Expand file tree Collapse file tree 2 files changed +26
-4
lines changed Expand file tree Collapse file tree 2 files changed +26
-4
lines changed Original file line number Diff line number Diff line change @@ -17,9 +17,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
17
17
{{ macros.enable_extra_repos(['rabbitmq', 'erlang'] ) }}
18
18
19
19
{% if base_package_type == 'rpm' %}
20
+
20
21
{% set kolla_toolbox_packages = [
21
22
'crudini' ,
22
- 'erlang-23.*' ,
23
23
'gcc' ,
24
24
'gdisk' ,
25
25
'git' ,
@@ -34,9 +34,20 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
34
34
'openssl-devel' ,
35
35
'openvswitch' ,
36
36
'python3-devel' ,
37
- 'rabbitmq-server-3.8.*'
38
37
] %}
39
38
39
+ {% if base_arch == 'aarch64' %}
40
+ {% set kolla_toolbox_packages = kolla_toolbox_packages + [
41
+ 'erlang-22.*' ,
42
+ 'rabbitmq-server-3.8.14'
43
+ ] %}
44
+ {% else %}
45
+ {% set kolla_toolbox_packages = kolla_toolbox_packages + [
46
+ 'erlang-23.*' ,
47
+ 'rabbitmq-server-3.8.*'
48
+ ] %}
49
+ {% endif %}
50
+
40
51
{% elif base_package_type == 'deb' %}
41
52
{% set kolla_toolbox_packages = [
42
53
'build-essential' ,
Original file line number Diff line number Diff line change @@ -13,12 +13,23 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
13
13
14
14
{% block rabbitmq_install %}
15
15
{% if base_package_type == 'rpm' %}
16
+
16
17
{% set rabbitmq_packages = [
17
18
'hostname' ,
18
- 'erlang-23.*' ,
19
- 'rabbitmq-server-3.8.*'
20
19
] %}
21
20
21
+ {% if base_arch == 'aarch64' %}
22
+ {% set rabbitmq_packages = rabbitmq_packages + [
23
+ 'erlang-22.*' ,
24
+ 'rabbitmq-server-3.8.14'
25
+ ] %}
26
+ {% else %}
27
+ {% set rabbitmq_packages = rabbitmq_packages + [
28
+ 'erlang-23.*' ,
29
+ 'rabbitmq-server-3.8.*'
30
+ ] %}
31
+ {% endif %}
32
+
22
33
{% elif base_package_type == 'deb' %}
23
34
{% set rabbitmq_packages = [
24
35
'logrotate' ,
You can’t perform that action at this time.
0 commit comments