diff options
| -rw-r--r-- | docker/base/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/base/apt_preferences.debian | 20 | ||||
| -rw-r--r-- | docker/kibana/Dockerfile.j2 | 10 | ||||
| -rw-r--r-- | docker/nova/nova-libvirt/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | kolla/template/repos.yaml | 7 | ||||
| -rw-r--r-- | releasenotes/notes/bug-1867365-115d717288e7c7d0.yaml | 6 |
6 files changed, 38 insertions, 10 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index c854f4cdf..baa1169da 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -450,7 +450,8 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom 'https://packages.grafana.com/gpg.key', 'http://buster-train.debian.net/debian/dists/pubkey.gpg', 'https://packages.treasuredata.com/GPG-KEY-td-agent', - 'https://repos.influxdata.com/influxdb.key' + 'https://repos.influxdata.com/influxdb.key', + 'https://obs.linaro.org/repos/home:/marcin.juszkiewicz/debian-buster/Release.key', ] %} {% set base_apt_packages = base_apt_packages + ['sudo',] diff --git a/docker/base/apt_preferences.debian b/docker/base/apt_preferences.debian index 859789d32..6f5c1622a 100644 --- a/docker/base/apt_preferences.debian +++ b/docker/base/apt_preferences.debian @@ -7,3 +7,23 @@ Pin-Priority: 1000 Package: smartmontools Pin: version 7.* Pin-Priority: 1000 + +# We do not want packages from this repo +Package: * +Pin: release o=obs://private/home:marcin.juszkiewicz/debian-buster +Pin-Priority: 100 + +# Unless it is libvirt (on aarch64) +Package: *libvirt* +Pin: release o=obs://private/home:marcin.juszkiewicz/debian-buster,b=arm64 +Pin-Priority: 600 + +# Unless it is kibana (on aarch64) +Package: kibana +Pin: release o=obs://private/home:marcin.juszkiewicz/debian-buster +Pin-Priority: 600 + +# on x86-64 use upstream package for kibana +Package: kibana +Pin: release o=elastic,b=amd64 +Pin-Priority: 700 diff --git a/docker/kibana/Dockerfile.j2 b/docker/kibana/Dockerfile.j2 index 2b1421f4e..c28f2a8d0 100644 --- a/docker/kibana/Dockerfile.j2 +++ b/docker/kibana/Dockerfile.j2 @@ -11,14 +11,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='kibana') }} -{% if base_arch != 'x86_64' and base_distro in ['debian', 'ubuntu'] %} - {% set kibana_packages = [ - 'nodejs', - 'http://obs.linaro.org/home:/marcin.juszkiewicz/debian-buster/all/kibana_5.6.16-0linaro1_all.deb' - ] %} -{% else %} - {% set kibana_packages = ['kibana'] %} -{% endif %} +{% set kibana_packages = ['kibana'] %} + {{ macros.install_packages(kibana_packages | customizable("packages")) }} COPY extend_start.sh /usr/local/bin/kolla_extend_start diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index 2e78ca63b..c9a806a14 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -9,7 +9,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='nova', groups='qemu') }} -{{ macros.enable_extra_repos(['ceph']) }} +{{ macros.enable_extra_repos(['ceph', 'libvirt']) }} {% if base_package_type == 'rpm' %} diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index a1d39dc5e..fcc470179 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -58,6 +58,13 @@ debian: kibana: "deb [arch=amd64] https://artifacts.elastic.co/packages/5.x/apt stable main" td-agent: "deb http://packages.treasuredata.com/3/debian/buster buster contrib" +debian-aarch64: + elasticsearch: "deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/debian-buster ./" + grafana: "deb https://packages.grafana.com/oss/deb stable main" + influxdb: "deb https://repos.influxdata.com/debian buster stable" + kibana: "deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/debian-buster ./" + libvirt: "deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/debian-buster ./" + ubuntu: elasticsearch: "deb https://artifacts.elastic.co/packages/5.x/apt stable main" grafana: "deb https://packages.grafana.com/oss/deb stable main" diff --git a/releasenotes/notes/bug-1867365-115d717288e7c7d0.yaml b/releasenotes/notes/bug-1867365-115d717288e7c7d0.yaml new file mode 100644 index 000000000..5e6c71a69 --- /dev/null +++ b/releasenotes/notes/bug-1867365-115d717288e7c7d0.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Fixes nova-libvirt networking failures on AArch64 (ARM64) servers running + on ThunderX CPUs. + `LP#1867365 <https://launchpad.net/bugs/1867365>`__ |