Merge "CentOS/AArch64: RabbitMQ is back!"

docker/base/Dockerfile.j2

@@ -93,7 +93,6 @@ COPY dnf.conf /etc/dnf/dnf.conf
     {% set base_yum_repo_files = [
         'grafana.repo',
         'rabbitmq_rabbitmq-server.repo',
-        'rabbitmq_rabbitmq-erlang-aarch64.repo',
     ] %}
     # FIXME(mgoddard): Not available for CentOS 8 yet.
     #
@@ -219,6 +218,10 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
     {% set base_centos_yum_repos_to_disable = base_centos_yum_repos_to_disable + [
         'influxdb',
     ] %}
+{% elif base_arch == 'aarch64' %}
+    {% set base_centos_yum_repo_packages = base_centos_yum_repo_packages + [
+        'centos-release-rabbitmq-38'
+    ] %}
 {% endif %}
 
 RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("centos_yum_repo_packages"), chain=True, clean=False) }}

docker/base/rabbitmq_rabbitmq-erlang-aarch64.repo

@@ -1,6 +0,0 @@
-[rabbitmq_rabbitmq-erlang]
-name=rabbitmq_rabbitmq-erlang
-baseurl=http://obs.linaro.org/home:/marcin.juszkiewicz/centos$releasever/
-gpgcheck=1
-enabled=0
-gpgkey=http://obs.linaro.org/home:/marcin.juszkiewicz/centos$releasever/repodata/repomd.xml.key

kolla/image/build.py

@@ -165,8 +165,6 @@ UNBUILDABLE_IMAGES = {
         "hacluster-pcs",  # no binary package
         "influxdb",       # no binary package
         "kibana",         # no binary package
-        "kolla-toolbox",  # no Erlang package
-        "rabbitmq",       # no Erlang package
         "telegraf",       # no binary package
     },
 

kolla/template/repos.yaml

@@ -20,7 +20,7 @@ centos-aarch64:
   elasticsearch: "elasticsearch-kibana-logstash-6.x"
   epel: "epel"
   epel-modular: "epel-modular"
-  erlang: "rabbitmq_rabbitmq-erlang"
+  erlang: "centos-rabbitmq-38"
   extras: "extras"
   grafana: "grafana"
   hacluster: "HighAvailability"