Skip to content

Synchronise xena with upstream #220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 2, 2023
Merged

Synchronise xena with upstream #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
637c5b4
ovsdpdk: add libdpdk-dev
mnasiadka Jan 31, 2023
5a099d9
Glance-api fails due to absent multipath tools
mmalchuk Apr 13, 2023
ab72fd7
Merge "ovsdpdk: add libdpdk-dev" into stable/xena
Apr 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion docker/glance/glance-api/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}

{% if base_package_type == 'rpm' %}
{% set glance_api_packages = ['qemu-img'] %}
{% set glance_api_packages = [
'device-mapper-multipath',
'qemu-img'
] %}
{% elif base_package_type == 'deb' %}
{% set glance_api_packages = [
'multipath-tools',
'nfs-common',
'qemu-utils'
] %}
Expand Down
5 changes: 3 additions & 2 deletions docker/ovsdpdk/ovsdpdk/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ RUN echo 'image not yet available for {{ base_distro }}' \
{% elif base_package_type == 'deb' %}

{% set ovs_dpdk_packages = [
'openvswitch-switch-dpdk',
'crudini'
'crudini',
'libdpdk-dev',
'openvswitch-switch-dpdk'
] %}

{{ macros.install_packages(ovs_dpdk_packages | customizable("packages")) }}
Expand Down