kolla/docker
Marcin Juszkiewicz a12d88c253 elasticsearch: install Java first on CentOS too
elasticsearch-oss package fails to install if we install it with Java:

INFO:kolla.common.utils.elasticsearch:could not find java; set JAVA_HOME
INFO:kolla.common.utils.elasticsearch:error: %prein(elasticsearch-oss-0:6.8.23-1.noarch) scriptlet failed, exit status 1
INFO:kolla.common.utils.elasticsearch:Error in PREIN scriptlet in rpm package elasticsearch-oss

Backport down to ussuri needed.

This change also includes a backport of
I7d4788f5b63fba24e3b2f9b15c16866ff811d83e:

Always use the distro-provided libvirt-python

This patch switches masakari-monitors image to follow nova-compute
and ceilometer-compute images.
This will be used and required after [1] merges.
Usage of libvirt-python from PyPI has already proven to be
problematic on CentOS Stream in our stable branches. [2]
With this patch we avoid those issues as well.

[1] https://review.opendev.org/c/openstack/masakari-monitors/+/804913
[2] https://review.opendev.org/c/openstack/kolla/+/797102

Depends-On: https://review.opendev.org/c/openstack/masakari-monitors/+/804913

NOTE(hrw): added removal of libvirt-python from upper-constraints as we have
never version of libvirt that Victoria used.

This change also includes a backport of
I5efab66e487e06abd1a56af97d7e7caa1ebc880d:

Use jinja2.pass_context instead of contextfilter

The contextfilter decorator was deprecated in jinja2 3.0.0, and has been
dropped in 3.1.0. This results in the following warning, and failed
attempts to use filters:

    [WARNING]: Skipping plugin (filters.py) as it seems to be invalid:
    module 'jinja2' has no attribute 'contextfilter'

This change switches to use the pass_context decorator. The minimum
version of Jinja2 is raised to 3 to ensure pass_context is present.

This change has been updated to also support Jinja2 2.x releases,
since the Wallaby upper constraints specify 2.11.3. In practice, most
users will not use UC to install kolla.

CoAuthored-by: Mark Goddard <mark@stackhpc.com>

Finally, amended for Debian Buster to also skip the lower
constraint from masakari-monitors.

Finally, finally, includes also hotfix for contextfunction.
Ie4bccb9ed3f4d8782730c5929abbfa73da215a8c

Change-Id: I72d7920acd8d15941c8c57a4186186212b273a38
(cherry picked from commit 976465c448)
2022-04-19 09:17:11 +00:00
..
aodh Remove support for CentOS 7 2020-04-15 09:32:06 +00:00
barbican Remove support for CentOS 7 2020-04-15 09:32:06 +00:00
base Build CentOS Stream 8 images 2022-02-28 12:56:44 +01:00
bifrost CentOS 8: Switch last mentions of yum to dnf 2020-04-15 14:17:40 +01:00
blazar Add block labels to all Dockerfiles 2020-03-01 17:25:58 +00:00
ceilometer ceilometer: do not fail when using an unsupported database type 2020-12-21 09:44:51 +00:00
certmonger Add block labels to all Dockerfiles 2020-03-01 17:25:58 +00:00
chrony Add block labels to all Dockerfiles 2020-03-01 17:25:58 +00:00
cinder cinder-volume/ubuntu: add lsscsi and nvme 2021-10-26 14:28:14 +00:00
cloudkitty Remove support for CentOS 7 2020-04-15 09:32:06 +00:00
collectd collectd: pcie-errors is x86-64 only now 2022-02-15 21:03:43 +00:00
congress Add block labels to all Dockerfiles 2020-03-01 17:25:58 +00:00
cron Add block labels to all Dockerfiles 2020-03-01 17:25:58 +00:00
cyborg Remove footer block from intermediate images 2021-01-12 11:09:53 +00:00
designate Remove support for CentOS 7 2020-04-15 09:32:06 +00:00
dnsmasq Add block labels to all Dockerfiles 2020-03-01 17:25:58 +00:00
ec2-api Add block labels to all Dockerfiles 2020-03-01 17:25:58 +00:00
elasticsearch elasticsearch: install Java first on CentOS too 2022-04-19 09:17:11 +00:00
etcd Add block labels to all Dockerfiles 2020-03-01 17:25:58 +00:00
fluentd Unify curl options 2021-08-24 20:38:36 +03:00
freezer Fix Freezer & Cyborg API startup on CentOS 2021-01-04 09:57:33 +00:00
glance Add boto3 as s3 dependency for Glance container 2021-07-28 19:48:29 +03:00
gnocchi gnocchi: add python3-rados to gnocchi-base source image 2021-07-20 11:01:03 +00:00
grafana Add block labels to all Dockerfiles 2020-03-01 17:25:58 +00:00
hacluster CentOS 8: Enable hacluster and masakari images 2020-03-12 17:43:54 +00:00
haproxy Add block labels to all Dockerfiles 2020-03-01 17:25:58 +00:00
heat Checks for heat_user_domain explicitly 2020-10-14 09:44:20 +00:00
horizon horizon: Correct location of monitoring_policy file 2021-06-21 16:27:09 +00:00
influxdb Add block labels to all Dockerfiles 2020-03-01 17:25:58 +00:00
ironic copy rootwarp files form venv in ironic base 2020-07-20 18:30:05 +00:00
ironic-inspector Install iptables in ironic-inspector container 2020-12-22 08:43:20 +00:00
iscsid Remove support for CentOS 7 2020-04-15 09:32:06 +00:00
kafka Unify curl options 2021-08-24 20:38:36 +03:00
karbor Add block labels to all Dockerfiles 2020-03-01 17:25:58 +00:00
keepalived Add block labels to all Dockerfiles 2020-03-01 17:25:58 +00:00
keystone Merge "Remove support for CentOS 7" 2020-04-15 14:02:57 +00:00
kibana kibana/debian: use upstream package on all architectures 2020-04-17 10:46:44 +02:00
kolla-toolbox erlang: use packages from Erlang Solutions on AArch64 2022-02-16 12:15:00 +00:00
kuryr Remove support for CentOS 7 2020-04-15 09:32:06 +00:00
logstash Fix Logstash 6 log rotation - Stable/Ussuri 2020-07-13 09:19:59 +00:00
magnum Add block labels to all Dockerfiles 2020-03-01 17:25:58 +00:00
manila Add glusterfs-fuse package to manila-share container 2020-08-24 12:12:37 +00:00
mariadb Unify curl options 2021-08-24 20:38:36 +03:00
masakari elasticsearch: install Java first on CentOS too 2022-04-19 09:17:11 +00:00
memcached Add block labels to all Dockerfiles 2020-03-01 17:25:58 +00:00
mistral Fix Mistral source images to respect upper-constraints 2021-01-29 20:01:21 +00:00
monasca monasca-grafana: Fix build errors 2021-12-13 09:37:16 +01:00
mongodb Remove support for CentOS 7 2020-04-15 09:32:06 +00:00
multipathd Add block labels to all Dockerfiles 2020-03-01 17:25:58 +00:00
murano Add block labels to all Dockerfiles 2020-03-01 17:25:58 +00:00
networking-baremetal/ironic-neutron-agent Remove support for CentOS 7 2020-04-15 09:32:06 +00:00
neutron neutron: Fix update-alternatives on CentOS 2021-10-12 18:57:14 +00:00
nova libvirt: add Cyrus SASL packages for DIGEST-MD5 2022-03-11 20:38:17 +00:00
novajoin Remove support for CentOS 7 2020-04-15 09:32:06 +00:00
octavia Use python3-openvswitch from distro 2022-03-02 08:26:00 +00:00
opendaylight Add block labels to all Dockerfiles 2020-03-01 17:25:58 +00:00
openstack-base Use python3-openvswitch from distro 2022-03-02 08:26:00 +00:00
openvswitch Improve pip install process for offline deployment. 2020-10-14 10:39:18 +01:00
ovn Add block labels to all Dockerfiles 2020-03-01 17:25:58 +00:00
ovsdpdk Add `crudini` to ovs-dpdk containers 2021-05-05 09:44:26 +00:00
panko Remove support for CentOS 7 2020-04-15 09:32:06 +00:00
placement Remove support for CentOS 7 2020-04-15 09:32:06 +00:00
prometheus Unify curl options 2021-08-24 20:38:36 +03:00
ptp Add block labels to all Dockerfiles 2020-03-01 17:25:58 +00:00
qdrouterd qdrouterd: drop Debian/Ubuntu part 2020-04-08 19:58:49 +00:00
qinling Remove support for CentOS 7 2020-04-15 09:32:06 +00:00
rabbitmq erlang: use packages from Erlang Solutions on AArch64 2022-02-16 12:15:00 +00:00
radvd Add block labels to all Dockerfiles 2020-03-01 17:25:58 +00:00
rally rally: add rally-openstack in source - follow up 2020-10-30 15:12:32 +00:00
redis Add block labels to all Dockerfiles 2020-03-01 17:25:58 +00:00
rsyslog Remove footer block from intermediate images 2021-01-12 11:09:53 +00:00
sahara Remove support for CentOS 7 2020-04-15 09:32:06 +00:00
searchlight Add block labels to all Dockerfiles 2020-03-01 17:25:58 +00:00
senlin Add block labels to all Dockerfiles 2020-03-01 17:25:58 +00:00
skydive Unify curl options 2021-08-24 20:38:36 +03:00
solum Add block labels to all Dockerfiles 2020-03-01 17:25:58 +00:00
storm Mitigate two Log4j vulnerabilities in Apache Storm 2022-01-24 09:50:27 +00:00
swift Add Swift lock path in Swift containers 2021-12-14 08:22:32 +00:00
tacker Remove support for CentOS 7 2020-04-15 09:32:06 +00:00
telegraf CentOS: disable more repos 2020-05-17 11:34:12 +00:00
tempest Add block labels to all Dockerfiles 2020-03-01 17:25:58 +00:00
tgtd Remove support for CentOS 7 2020-04-15 09:32:06 +00:00
tripleoclient Remove support for CentOS 7 2020-04-15 09:32:06 +00:00
trove Add block labels to all Dockerfiles 2020-03-01 17:25:58 +00:00
vitrage Merge "Remove support for CentOS 7" 2020-04-15 14:02:57 +00:00
vmtp Add block labels to all Dockerfiles 2020-03-01 17:25:58 +00:00
watcher Add block labels to all Dockerfiles 2020-03-01 17:25:58 +00:00
zaqar Remove support for CentOS 7 2020-04-15 09:32:06 +00:00
zookeeper Unify curl options 2021-08-24 20:38:36 +03:00
zun Unify curl options 2021-08-24 20:38:36 +03:00
macros.j2 Improve pip install process for offline deployment. 2020-10-14 10:39:18 +01:00