diff options
| author | Zuul <zuul@review.opendev.org> | 2020-04-09 01:53:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-04-09 01:53:10 +0000 |
| commit | b247692669568b2d03c4bd64b0cdb13f8f990963 (patch) | |
| tree | e33a27bed087d7511d9684b7212647cd1e777ec5 | |
| parent | 89f46e9450564af37a9ea7f86dbcad248be453f2 (diff) | |
| parent | dfc336ded269f5a83c75693486b4302b3e29fc30 (diff) | |
| download | kolla-b247692669568b2d03c4bd64b0cdb13f8f990963.tar.gz kolla-b247692669568b2d03c4bd64b0cdb13f8f990963.zip | |
Merge "base/centos: influxdb repo is only on x86-64"
| -rw-r--r-- | docker/base/Dockerfile.j2 | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 5bba199ed..9670dcdf4 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -260,8 +260,15 @@ COPY ceph.repo /etc/yum.repos.d/ {% set base_centos_yum_repos_to_disable = [ 'centos-ceph-nautilus', 'centos-nfs-ganesha28', - 'influxdb', ] %} + + +{% if base_arch == 'x86_64' %} + {% set base_centos_yum_repos_to_disable = base_centos_yum_repos_to_disable + [ + 'influxdb', + ] %} +{% endif %} + {% if distro_package_manager == 'yum' %} {% set base_centos_yum_repos_to_disable = base_centos_yum_repos_to_disable + [ 'centos-qemu-ev', |