Skip to content

Synchronise xena with upstream #222

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 2 commits into from
May 15, 2023
Merged

Synchronise xena with upstream #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6aeeb0
Support qemu block rbd in nova-compute (source)
Alex-Welsh May 9, 2023
fed3e69
fluentd: cap elasticsearch again
mnasiadka May 4, 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
16 changes: 8 additions & 8 deletions docker/fluentd/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,7 @@ LABEL fluentd_version="0.14" fluentd_binary="td-agent"

{{ macros.configure_user(name=fluentd_user, groups='mysql') }}

# NOTE(frickler): Downgrading elasticsearch gems for compatibility with OSS versions of ES
{{ macros.install_packages(fluentd_packages | customizable("packages")) }}{% if base_arch in ['aarch64', 'x86_64'] %} \
&& td-agent-gem install elasticsearch:7.13.0 \
&& td-agent-gem uninstall "elasticsearch:>7.13.0" \
&& td-agent-gem uninstall "elasticsearch-api:>7.13.0" \
&& td-agent-gem uninstall "elasticsearch-transport:>7.13.0"
{% endif %}
{{ macros.install_packages(fluentd_packages | customizable("packages")) }}

# Distro specific files and operations
# Fluentd on rpm-based non-x86_64 is installed from rpm
Expand Down Expand Up @@ -105,7 +99,13 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start
RUN ln -s /bin/mkdir /usr/bin/mkdir
{% endif %}

{{ macros.install_fluent_plugins(fluentd_user, fluentd_plugins | customizable("plugins")) }}
{# NOTE(frickler): Downgrading elasticsearch gems for compatibility with OSS versions of ES #}
{{ macros.install_fluent_plugins(fluentd_user, fluentd_plugins | customizable("plugins")) }} \
&& td-agent-gem install elasticsearch:7.13.0 \
&& td-agent-gem uninstall "elasticsearch:>7.13.0" \
&& td-agent-gem uninstall "elasticsearch-api:>7.13.0" \
&& td-agent-gem uninstall "elasticsearch-transport:>7.13.0" \
&& td-agent-gem uninstall "elastic-transport:>7.13.0"

{% endblock %}

Expand Down
2 changes: 2 additions & 0 deletions docker/nova/nova-compute/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ RUN rm -f /etc/nova/nova-compute.conf
'python3-libvirt',
'python3-rtslib',
'qemu-img',
'qemu-kvm-block-rbd',
'sysfsutils',
'targetcli',
'xfsprogs'
Expand Down Expand Up @@ -148,6 +149,7 @@ RUN rm -f /etc/nova/nova-compute.conf
'python3-rados',
'python3-rbd',
'python3-rtslib-fb',
'qemu-block-extra',
'qemu-utils',
'sasl2-bin',
'sysfsutils',
Expand Down