diff options
| author | Zuul <zuul@review.opendev.org> | 2020-07-01 17:36:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-07-01 17:36:42 +0000 |
| commit | 1d4d23cf0ea1dbfd2e6acde3b5292697610ca15d (patch) | |
| tree | a9fc211f912d7f74965033fb9daf2ec198bcafb0 | |
| parent | a4ee0d4ada9b82530f4cc6c21bbc134447abd2b9 (diff) | |
| parent | b2c86fd3addcbc1451fd9f580445315833fabf72 (diff) | |
| download | kolla-1d4d23cf0ea1dbfd2e6acde3b5292697610ca15d.tar.gz kolla-1d4d23cf0ea1dbfd2e6acde3b5292697610ca15d.zip | |
Merge "CentOS/AArch64: RabbitMQ is back!"
| -rw-r--r-- | docker/base/Dockerfile.j2 | 5 | ||||
| -rw-r--r-- | docker/base/rabbitmq_rabbitmq-erlang-aarch64.repo | 6 | ||||
| -rwxr-xr-x | kolla/image/build.py | 2 | ||||
| -rw-r--r-- | kolla/template/repos.yaml | 2 |
4 files changed, 5 insertions, 10 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 9a8645f18..4a2b31d13 100644 --- a/docker/base/Dockerfile.j2 +++ b/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) }} diff --git a/docker/base/rabbitmq_rabbitmq-erlang-aarch64.repo b/docker/base/rabbitmq_rabbitmq-erlang-aarch64.repo deleted file mode 100644 index 2d6b5b073..000000000 --- a/docker/base/rabbitmq_rabbitmq-erlang-aarch64.repo +++ /dev/null @@ -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 diff --git a/kolla/image/build.py b/kolla/image/build.py index 5e79dffbb..e432bfb9a 100755 --- a/kolla/image/build.py +++ b/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 }, diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index 29434a529..63f02cba2 100644 --- a/kolla/template/repos.yaml +++ b/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" |