Skip to content

Synchronise yoga with upstream #224

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

Synchronise yoga with upstream #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6a8e8a7
neutron: Add iproute-tc
mnasiadka Jan 31, 2023
8e8ef4c
fluentd: cap elasticsearch again
mnasiadka May 4, 2023
e590ec3
https: remove dhparams.pem before running gencerts
mnasiadka Mar 6, 2023
a28b7d7
Support qemu block rbd in nova-compute (source)
Alex-Welsh May 9, 2023
d4b4439
Merge "neutron: Add iproute-tc" into stable/yoga
May 9, 2023
1140032
Merge "Support qemu block rbd in nova-compute (source)" into stable/yoga
May 9, 2023
a6b6e65
Merge "fluentd: cap elasticsearch again" into stable/yoga
May 9, 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
2 changes: 2 additions & 0 deletions docker/base/httpd_setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ if [[ "$(whoami)" == 'root' ]]; then
# on startup:
# SSLCertificateFile: file '/etc/pki/tls/certs/localhost.crt' does not exist or is empty
# Work around this by generating certificates manually.
# NOTE(mnasiadka): in EL9 upgrade jobs gencerts is failing on wrong permissions to dhparams.pem
if [[ "${KOLLA_BASE_DISTRO}" =~ centos|rocky ]] && [[ ! -e /etc/pki/tls/certs/localhost.crt ]]; then
rm -f /tmp/dhparams.pem
/usr/libexec/httpd-ssl-gencerts
fi
fi
15 changes: 8 additions & 7 deletions docker/fluentd/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build

{{ 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")) }} \
&& 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"
{{ macros.install_packages(fluentd_packages | customizable("packages")) }}

COPY fluentd_sudoers /etc/sudoers.d/kolla_fluentd_sudoers

Expand All @@ -57,7 +52,13 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start
'fluent-plugin-rewrite-tag-filter',
] %}

{{ macros.install_fluent_plugins(fluentd_plugins | customizable("plugins")) }}
{# NOTE(frickler): Downgrading elasticsearch gems for compatibility with OSS versions of ES #}
{{ macros.install_fluent_plugins(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/neutron/neutron-base/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if base_package_type == 'rpm' %}

{% set neutron_base_packages = [
'iproute-tc',
'iputils',
'keepalived',
'net-tools',
Expand Down Expand Up @@ -54,6 +55,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'dnsmasq',
'dnsmasq-utils',
'haproxy',
'iproute-tc',
'ipset',
'iptables',
'iputils',
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 @@ -149,6 +150,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