Skip to content

Commit da0df53

Browse files
markgoddardmarkgoddard
authored
Merge pull request #243 from stackhpc/upstream/yoga-2023-08-21
Synchronise yoga with upstream
2 parents 8269c1e + f1d1881 commit da0df53

File tree

13 files changed

+170
-67
lines changed

13 files changed

+170
-67
lines changed

‎.zuul.d/rocky.yaml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,27 @@
2020
experimental:
2121
jobs:
2222
- kolla-build-no-infra-wheels-rocky9
23+
# Test rabbitmq and mariadb in multinode ceph jobs.
24+
- kolla-ansible-rocky9-cephadm:
25+
files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
26+
- kolla-ansible-rocky9-zun:
27+
files: ^docker\/(base|cinder|etcd|iscsid|kuryr|openstack-base|zun)\/.*
28+
- kolla-ansible-rocky9-ironic:
29+
files: ^docker\/(base|dnsmasq|ironic|ironic-inspector|iscsid|openstack-base)\/.*
30+
- kolla-ansible-rocky9-swift:
31+
files: ^docker/(base|openstack-base|glance|swift)/
32+
- kolla-ansible-rocky9-mariadb:
33+
files: ^docker/(base|mariadb)/
34+
- kolla-ansible-rocky9-masakari:
35+
files: ^docker/(base|masakari|openstack-base)/
36+
- kolla-ansible-rocky9-octavia:
37+
files: ^docker/(base|neutron|octavia|openstack-base|openvswitch|ovn)/
38+
- kolla-ansible-rocky9-ovn:
39+
files: ^docker/(base|neutron|openstack-base|openvswitch|ovn)/
40+
- kolla-ansible-rocky9-prometheus-opensearch:
41+
files: ^docker/(base|opensearch|fluentd|grafana|prometheus)/
42+
- kolla-ansible-rocky9-kvm:
43+
files: ^docker/nova/
2344

2445
- job:
2546
name: kolla-build-rocky9-source

‎docker/base/Dockerfile.j2‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ Repo files not available for CentOS Stream 9:
6464
'grafana.repo',
6565
'influxdb.repo',
6666
'mariadb.repo',
67+
'opensearch.repo',
6768
'proxysql.repo',
6869
'rabbitmq_rabbitmq-server.repo',
6970
'td.repo',
@@ -192,6 +193,8 @@ RUN rm -f /etc/rpm/macros.image-language-conf \
192193
'centos-opstools',
193194
'centos-rabbitmq-38',
194195
'epel',
196+
'opensearch-2.x',
197+
'opensearch-dashboards-2.x',
195198
'influxdb',
196199
] %}
197200

@@ -240,6 +243,7 @@ RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("cen
240243
{# NOTE(hrw): CentOS Stream 9 has curl-minimal, Rocky Linux 9 has curl so we do not install any #}
241244
{% set base_centos_packages = [
242245
'ca-certificates',
246+
'crypto-policies-scripts',
243247
'dumb-init',
244248
'findutils',
245249
'hostname',
@@ -355,6 +359,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
355359
{'name': 'grafana', 'url': 'https://packages.grafana.com/gpg.key'},
356360
{'name': 'influxdb', 'url': 'https://repos.influxdata.com/influxdata-archive_compat.key'},
357361
{'name': 'mariadb', 'url': 'https://downloads.mariadb.com/MariaDB/mariadb-keyring-2019.gpg', 'type': 'gpg'},
362+
{'name': 'opensearch', 'url': 'https://artifacts.opensearch.org/publickeys/opensearch.pgp'},
358363
{'name': 'proxysql', 'url': 'https://repo.proxysql.com/ProxySQL/repo_pub_key'},
359364
{'name': 'treasuredata', 'url': 'https://packages.treasuredata.com/GPG-KEY-td-agent'},
360365
] %}

‎docker/base/hrw-copr-erlang-for-rabbitmq.repo‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
[copr-hrw-erlang-for-rabbitmq]
66
name=Hrw's COPR with Erlang build for RabbitMQ
7-
baseurl=https://download.copr.fedorainfracloud.org/results/hrw/erlang-for-rabbitmq/centos-stream-$releasever-$basearch/
7+
baseurl=https://download.copr.fedorainfracloud.org/results/hrw/erlang-25-for-rabbitmq/centos-stream-$releasever-$basearch/
88
gpgcheck=1
99
enabled=0
10-
gpgkey=https://download.copr.fedorainfracloud.org/results/hrw/erlang-for-rabbitmq/pubkey.gpg
10+
gpgkey=https://download.copr.fedorainfracloud.org/results/hrw/erlang-25-for-rabbitmq/pubkey.gpg
1111
repo_gpgcheck=0

‎docker/base/opensearch.repo‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
[opensearch-2.x]
2+
name=OpenSearch 2.x
3+
baseurl=https://artifacts.opensearch.org/releases/bundle/opensearch/2.x/yum
4+
enabled=0
5+
repo_gpgcheck=1
6+
gpgcheck=1
7+
gpgkey=https://artifacts.opensearch.org/publickeys/opensearch.pgp
8+
autorefresh=1
9+
type=rpm-md
10+
11+
[opensearch-dashboards-2.x]
12+
name=OpenSearch Dashboards 2.x
13+
baseurl=https://artifacts.opensearch.org/releases/bundle/opensearch-dashboards/2.x/yum
14+
enabled=0
15+
repo_gpgcheck=1
16+
gpgcheck=1
17+
gpgkey=https://artifacts.opensearch.org/publickeys/opensearch.pgp
18+
autorefresh=1
19+
type=rpm-md

‎docker/elasticsearch/elasticsearch-curator/Dockerfile.j2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
2727
# NOTE(parallax): pin elasticsearch due to bug: https://bugs.launchpad.net/kolla/+bug/1941073
2828
{% set elasticsearch_curator_pip_packages = [
2929
'elasticsearch==7.13.*',
30-
'elasticsearch-curator'
30+
'elasticsearch-curator==5.8.4'
3131
] %}
3232

3333
RUN {{ macros.install_pip(['pip', 'wheel', 'setuptools'], constraints=false) }} \

‎docker/opensearch/opensearch-dashboards/Dockerfile.j2‎

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,27 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
77

88
{% import "macros.j2" as macros with context %}
99

10-
{{ macros.configure_user(name='opensearch', shell='/bin/bash', homedir='/usr/share/opensearch') }}
10+
{{ macros.configure_user(name='opensearch-dashboards', shell='/bin/bash', homedir='/usr/share/opensearch-dashboards') }}
11+
{{ macros.enable_extra_repos(['opensearch-dashboards']) }}
1112

12-
{% block opensearch_version %}
13+
{% set opensearch_dashboards_packages = ['opensearch-dashboards'] %}
1314

14-
{% if base_arch == 'x86_64' %}
15-
{% set arch_os='x64' %}
16-
{% elif base_arch == 'aarch64' %}
17-
{% set arch_os='arm64' %}
18-
{% endif %}
15+
{% if base_distro_tag.startswith('stream9') or base_distro == 'rocky' %}
16+
{# TODO: OpenSearch will move from SHA1 in 2.8 release, remove this once 2.8 is out #}
17+
RUN update-crypto-policies --set DEFAULT:SHA1
18+
{% endif %}
1919

20-
ARG opensearch_version=2.3.0
21-
ARG opensearch_dashboards_url=https://artifacts.opensearch.org/releases/bundle/opensearch-dashboards/${opensearch_version}/opensearch-dashboards-${opensearch_version}-linux-{{ arch_os }}.tar.gz
22-
{% endblock %}
23-
24-
ARG OPENSEARCH_DASHBOARDS_HOME=/usr/share/opensearch-dashboards
25-
26-
RUN mkdir -p $OPENSEARCH_DASHBOARDS_HOME && \
27-
curl -o /tmp/opensearch-dashboards.tgz ${opensearch_dashboards_url} && \
28-
tar -xzpf /tmp/opensearch-dashboards.tgz -C $OPENSEARCH_DASHBOARDS_HOME --strip-components=1 && \
29-
rm /tmp/opensearch-dashboards.tgz
20+
{# TODO: ugly hack to get past opensearch postinst, remove once #}
21+
{# https://github.com/opensearch-project/opensearch-build/pull/3435 gets merged #}
22+
{# and packages get rebuilt #}
23+
RUN touch /usr/bin/systemd-tmpfiles && chmod a+rx /usr/bin/systemd-tmpfiles \
24+
&& {{ macros.install_packages(opensearch_dashboards_packages | customizable("packages"), chain=True) }} \
25+
&& rm -f /usr/bin/systemd-tmpfiles
3026

3127
COPY extend_start.sh /usr/local/bin/kolla_extend_start
3228
RUN chmod 755 /usr/local/bin/kolla_extend_start
3329

3430
{% block opensearch_footer %}{% endblock %}
3531
{% block footer %}{% endblock %}
3632

37-
USER opensearch
33+
USER opensearch-dashboards

‎docker/opensearch/opensearch-dashboards/extend_start.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#!/bin/bash
22

3-
if [[ ! -d "/var/log/kolla/opensearch" ]]; then
4-
mkdir -p /var/log/kolla/opensearch
3+
if [[ ! -d "/var/log/kolla/opensearch-dashboards" ]]; then
4+
mkdir -p /var/log/kolla/opensearch-dashboards
55
fi
6-
if [[ $(stat -c %a /var/log/kolla/opensearch) != "755" ]]; then
7-
chmod 755 /var/log/kolla/opensearch
6+
if [[ $(stat -c %a /var/log/kolla/opensearch-dashboards) != "755" ]]; then
7+
chmod 755 /var/log/kolla/opensearch-dashboards
88
fi
99

1010
export DASHBOARDS_HOME=/usr/share/opensearch-dashboards

‎docker/opensearch/opensearch/Dockerfile.j2‎

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,22 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
88
{% import "macros.j2" as macros with context %}
99

1010
{{ macros.configure_user(name='opensearch', shell='/bin/bash', homedir='/usr/share/opensearch') }}
11-
12-
{% block opensearch_version %}
13-
14-
{% if base_arch == 'x86_64' %}
15-
{% set arch_os='x64' %}
16-
{% elif base_arch == 'aarch64' %}
17-
{% set arch_os='arm64' %}
18-
{% endif %}
19-
20-
ARG opensearch_version=2.3.0
21-
ARG opensearch_url=https://artifacts.opensearch.org/releases/bundle/opensearch/${opensearch_version}/opensearch-${opensearch_version}-linux-{{ arch_os }}.tar.gz
22-
{% endblock %}
23-
24-
ARG OPENSEARCH_HOME=/usr/share/opensearch
25-
26-
RUN curl -o /tmp/opensearch.tgz ${opensearch_url} && \
27-
tar -xzpf /tmp/opensearch.tgz -C $OPENSEARCH_HOME --strip-components=1 && \
28-
rm /tmp/opensearch.tgz && \
29-
mkdir -p $OPENSEARCH_HOME/data && chown -R opensearch:opensearch $OPENSEARCH_HOME/data
11+
{{ macros.enable_extra_repos(['opensearch']) }}
12+
13+
{% set opensearch_packages = [
14+
'opensearch'
15+
] %}
16+
17+
{% if base_distro_tag.startswith('stream9') or base_distro == 'rocky' %}
18+
{# TODO: OpenSearch will move from SHA1 in 2.8 release, remove this when 2.8 is out #}
19+
RUN update-crypto-policies --set DEFAULT:SHA1
20+
{% endif %}
21+
22+
{# TODO: ugly hack to get past opensearch postinst, remove once #}
23+
{# https://github.com/opensearch-project/opensearch-build/pull/3435 gets merged #}
24+
{# and packages get rebuilt #}
25+
RUN touch /usr/bin/systemd-tmpfiles && chmod a+rx /usr/bin/systemd-tmpfiles \
26+
&& {{ macros.install_packages(opensearch_packages | customizable("packages"), chain=True) }}
3027

3128
COPY extend_start.sh /usr/local/bin/kolla_extend_start
3229
RUN chmod 755 /usr/local/bin/kolla_extend_start

‎docker/openstack-base/Dockerfile.j2‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,8 @@ RUN ln -s openstack-base-source/* /requirements \
330330

331331
ENV PATH /var/lib/kolla/venv/bin:$PATH
332332

333-
{% if (base_distro == 'centos' and base_distro_tag.startswith('stream9')) or base_distro == 'rocky' %}
333+
{# NOTE: pin setuptools on python 3.9 (centos,debian) due to horizon build failures #}
334+
{% if distro_python_version == '3.9' %}
334335
RUN {{ macros.install_pip(['pip', 'wheel', 'setuptools==67.2.*']) }} \
335336
{% else %}
336337
RUN {{ macros.install_pip(['pip', 'wheel', 'setuptools']) }} \

‎docker/ovsdpdk/ovsdpdk/Dockerfile.j2‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ RUN echo 'image not yet available for {{ base_distro }}' \
1919
{% elif base_package_type == 'deb' %}
2020

2121
{% set ovs_dpdk_packages = [
22-
'openvswitch-switch-dpdk',
23-
'crudini'
22+
'crudini',
23+
'libdpdk-dev',
24+
'openvswitch-switch-dpdk'
2425
] %}
2526

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

0 commit comments

Comments
 (0)