summaryrefslogtreecommitdiff
path: root/docker
AgeCommit message (Collapse)AuthorFilesLines
2020-09-07Replace cradox with radosMatthias Runge1-2/+2
Gnocchi supports both, but cradox is not actively maintained. Change-Id: I3d9547237ffa3ee02c306376f0e553fce5472e57 (cherry picked from commit 934d0b21f8f709f44f795b6629ddf8cfd65f7be8) (cherry picked from commit 9bbc7531e249032ad6f5647863db21d88322f7f2)
2020-09-04Merge "Use upstream Erlang on CentOS 8" into stable/trainZuul4-9/+18
2020-09-04Use upstream Erlang on CentOS 8Radosław Piliszek4-9/+18
Train only. In CentOS 8 Train we had a mix of rmq upstream and rdo packages, erlang was from RDO and rmq (3.7) from rmq. As this is not really tested by any other party, I propose to unify the sources of both. Change-Id: I52094ce9e3d98cbdedfdc23c8a43dd3093ce1771 Closes-bug: #1884034
2020-09-03Add glusterfs-fuse package to manila-share containerLinPeiWen1-2/+4
Change-Id: I2b4cfdb25f3ff82d8d6fdebba8b75a818c10a388 (cherry picked from commit 9ca43b9ed7814045a0219e17524f4e2aed2f1771)
2020-09-03Upgrade Fluentd Monasca pluginDoug Szumski1-1/+1
Switch to YAJI JSON parser as suggested in [1]. [1] https://docs.fluentd.org/quickstart/faq#i-got-encoding-error-inside-plugin-how-to-fix-it Closes-Bug: #1889065 Change-Id: I2ecd3b029b956e000feaaa9e10a169521ba53d66 (cherry picked from commit 556d4353aa846765557cfdd3c6e087a25248c517)
2020-09-03Revert "openstack-base: pin setuptools < 46 to get horizon working"Radosław Piliszek1-5/+0
This reverts commit ca8b61516401d61d90e2940fa130c8f55a8b6e45. This is to fix recent breakage caused by setuptools and virtualenv incompatibilities. Includes bifrost version bump to fix its building. Change-Id: Ia6c415b18374cefa3f160229d1f58cb209df348e Closes-Bug: #1893920 Depends-On: https://review.opendev.org/749576
2020-07-27Fix masakari-monitors image on CentOS 8Mark Goddard1-0/+1
Train only. The version of libvirt-python allowed by upper-constraints in Train (5.7.0) does not support CentOS 8. This prevented the masakari-monitors image from building. This change modifies the upper constraints file in the masakari-monitors image to use 5.10.0, the earliest version that does support CentOS 8. Change-Id: Ia980be14fdf9c4fc15bb379b940ae491de035725
2020-07-14Fix Logstash 6 log rotation - Stable/TrainBartosz Bezak1-0/+9
Logstash 6 introduced in Centos 8 in Train release comes with log4j2 configuration that does not remove old compressed logs after rotation Log rotation config backported from Logstash 7 - Combination of Size Based and Time Based policies. Deletion occurs after 30 days or 3000 MB log files size - whichever comes first. Change-Id: Ib44f493aad0813a8aba916c7c353b60cab954b5f (cherry picked from commit 15f2af1b0217da0a0281268442202f22915570a1) Closes-Bug: #1886975
2020-07-12Merge "Bump prometheus-openstack-exporter version to 1.1.0" into stable/trainZuul1-1/+1
2020-07-07Bump prometheus-openstack-exporter version to 1.1.0Jorge Niedbalski1-1/+1
Change-Id: Ia2306507d6ef97f01ff520dc4222bc48c1eb9843 Signed-off-by: Jorge Niedbalski <jnr@metaklass.org>
2020-07-06Drop systemd support from nsswitch.conf on RHEL-based distros9.2.0Michele Baldessari1-1/+2
A bit like we did for I3e0e86026f5a4a78473bed824cd1682d3a020cd5 we should remove the nss-systemd lookup from containers. The reasons for this are as follows: 1) Just like for I3e0e86026f5a4a78473bed824cd1682d3a020cd5 when this nss module is triggered it tries to talk to dbus. It triggers a bunch of selinux denials and it makes little sense to open all containers to talk to dbus. In particular, if a container is run as non-privileged and bind-mounts /run from the host, we will hit selinux denials like the following: type=USER_AVC msg=audit(1592337775.860:74119): pid=1284 uid=81 auid=4294967295 ses=4294967295 subj=system_u:system_r:system_dbusd_t:s0-s0:c0.c1023 msg='avc: denied { send_msg } for msgtype=method_call interface=org.freedesktop.DBus member=Hello dest=org.freedesktop.DBus spid=406228 scontext=system_u:system_r:container_t:s0:c162,c886 tcontext=system_u:system_r:system_dbusd_t:s0-s0:c0.c1023 tclass=dbus permissive=0 exe="/usr/bin/dbus-daemon" sauid=81 hostname=? addr=? terminal=?'UID="dbus" AUID="unset" SAUID="dbus" 2) It just makes little sense in a kolla-world to have containers talk to dbus/systemd and it saves us some time when a lookup triggers the systemd module for whatever reason. Especially because the nss-systemd module does a few things which are not useful in a container (ensures that the root and nobody users and groups remain resolvable, SystemD's DynamicUser= feature, provide Lookup API via Varlink) The sed regex gives us the wanted results: $ diff -u /etc/nsswitch.conf.orig /etc/nsswitch.conf --- /etc/nsswitch.conf.orig 2020-06-19 07:18:10.974580755 +0000 +++ /etc/nsswitch.conf 2020-06-19 07:20:12.260230103 +0000 @@ -53,9 +53,9 @@ # group: db files # In order of likelihood of use to accelerate lookup. -passwd: sss files systemd +passwd: sss files shadow: files sss -group: sss files systemd +group: sss files hosts: files dns myhostname services: files sss netgroup: sss Related-Bug: #1883849 Change-Id: I81e5b7abf4571fece13a029e25911e9e4dece673 (cherry picked from commit dc2ddfa9750f94430a5b04b62fc1fa6adcb234f8)
2020-07-01Merge "Add Elasticsearch Curator Docker image" into stable/trainZuul4-0/+48
2020-07-01Merge "Add Logstash 6 for Monasca on Centos 8" into stable/trainZuul3-0/+43
2020-06-29Merge "add libibverbs package for openvswitch" into stable/trainZuul2-0/+2
2020-06-28Add Elasticsearch Curator Docker imageDoug Szumski4-0/+48
Kolla provides log aggregation, but no solution to set retention periods for aggregated logs. It therefore accumulates log data indefinitely unless a user manually intervenes. This change adds Elasticsearch Curator which provides a mechanism for automating such retention periods [1]. [1] https://www.elastic.co/guide/en/elasticsearch/client/curator/current/about.html The container contains cron to support running Curator periodically. Change-Id: Ief2c554a64ef6cc971635d7e2a718f63c310fbf6 (cherry picked from commit 37de8920aa7394089731c0fae75034c2c3d137ca)
2020-06-26Change lang package block orderGaël THEROND1-15/+17
Fix offline installation of language pack packages. Change-Id: I9f4a21bbf1c8383e21e59350206aba3424602270 Closes-bug: #1883233 (cherry picked from commit f9def021d86caecfd57018f41792f8a7c6bc6a80) (cherry picked from commit 714e1feaea947b6a014d34e5a9cecfc777472ca1)
2020-06-26Merge "Fix missing nfs-ganesha-rados-urls package for CentOS" into stable/trainZuul1-1/+2
2020-06-26Merge "Add collectd-amqp to the collectd image" into stable/trainZuul1-0/+1
2020-06-25Fix loading of Storm on Centos8 / Python 3Doug Szumski1-0/+7
In the Centos8 images, Storm fails to start since it cannot find Python. This patch ensures that it can by setting the PYTHON env var. Change-Id: If6663b2f6dfadfd6a6db5e4aaca4eb782b87161f Closes-Bug: #1876461
2020-06-25Add Logstash 6 for Monasca on Centos 8Doug Szumski3-0/+43
On Centos 8 we have Elasticsearch and Kibana 6, but Logstash (used by Monasca) is stuck on 2 which is not compatible. See the product compatibility matrix [1]. This adds Logstash 6, so that Monasca can use the full ELK 6 stack on Centos 8. Note that Monasca doesn't officially support ELK 6, but it does work. [1] https://www.elastic.co/support/matrix#matrix_compatibility Partial-Bug: #1884090 Change-Id: Id6f79e301cc109a029913f5628bab1848c138e7f
2020-06-22Fix missing nfs-ganesha-rados-urls package for CentOSMichal Nasiadka1-1/+2
Change-Id: I0c872bc404b3df96b9da58b8efe3b64c174d9c48 Closes-Bug: #1884203
2020-06-19kolla-toolbox: use u-c while installing virtualenvMarcin Juszkiewicz1-4/+4
We need to be sure that we use exact same version every time. So fetch upper-constraints.txt file earlier and use it while installing virtualenv package. Change-Id: I61711a878b2bda9f0d2e88966f13121dfcddfda7 (cherry picked from commit 13f9303b96502dba9d8696909f7e27f44675574a)
2020-06-19CI: Install python deps, fix mod_wsgi in cyborg-api, disable masakari-monitorsMichal Nasiadka1-1/+5
setuptools is missing from infra image - so it needs to be installed. Copy cat of a kolla-ansible change: https://review.opendev.org/#/c/735808/ Fixes also cyborg-api to use py3 mod_wsgi in centos8 Temporarily disables masakari-monitors build, because it fails on centos8 due to problems with libvirt-python===5.7.0 (upper-constraints): Missing type converters: virTypedParameterPtr:1 ERROR: failed virConnectSetIdentity Depends-On: https://review.opendev.org/#/c/736744/ Change-Id: I6068abcbc0e73eeab77b0aa99983a95adc6defd3
2020-06-18Add collectd-amqp to the collectd imageMatthias Runge1-0/+1
This allows to write collected data via amqp. Change-Id: Ieb88fd60d177f19a635ada9366193e57c516f90b (cherry picked from commit 8bfa655007e9795ee6b4eba09cba4f403c113b48)
2020-06-16add libibverbs package for openvswitchwuchunyang2-0/+2
ovs images which based on centos miss libibverbs package. this ps add the package to neutron-ovs-agent and ovs-base images. Closes-Bug: 1882863 Change-Id: I3e307efc43f934a944a91d5d131a11f607411df2 (cherry picked from commit 6d71ac843e85126bfe35c9a39d64c1767d360c74) (cherry picked from commit 5bd7d3fc7adde6d0f87c6dcb0ce497fd94bf0601)
2020-06-08Fix multiple issuesMark Goddard1-1/+2
Both issues affect Train and earlier releases. 1. Fix monasca-grafana by pinning more Ruby gems childprocess 3.0.0 and ffi 1.13.0 depend on Ruby 2.3. 2. Bump bifrost to 7.2.1 Bifrost had a fix to stop using the master branch of DIB which dropped support for Python 2. Change-Id: Ida7e20833360bbca69c6aafc4f5d7cb375bb106f Closes-Bug: #1882070
2020-05-26nova-compute: add ndctl to expose NVDIMMs to guestsPiotr Kopec1-0/+18
`ndctl` is a utility for managing the nvdimm subsystem required by Nova for attaching PMEM(persistent memory) namespaces to guests [0]. [0]: https://docs.openstack.org/nova/latest/admin/virtual-persistent-memory.html Change-Id: I8ed1b6c1d0985b2a73206bd9249a5664cd80c912 Closes-Bug: #1870455 (cherry picked from commit f9ea23d940ec4ce35d503ac62f202daaa9db502d)
2020-05-23Merge "Ensure the confs exists for cyborg and masakari" into stable/trainZuul2-1/+4
2020-05-21qdrouterd: ignore failure of disabling epel reposBhagyashri Shewale1-1/+1
There are cases when epel repos are not setup in that case dnf config-manager will fail. Let's ignore the failure in such cases. This change is needed only for Train branch. Change-Id: Ic1b74ccc7c8e6ee2e4c025e8b29150d1a1d96f2f Partially-Implements: blueprint centos-rhel-8 Signed-off-by: Bhagyashri Shewale <bshewale@redhat.com>
2020-05-20Ensure the confs exists for cyborg and masakarigugug2-1/+4
1. When cyborg images build completed, the /etc/cyborg folder is not exits, and there is not confs, especially the api-paste.ini 2. When masakari images build completed, it's configs is missing, this ps add them together cyborg should keep consistence with the other images[1], this PS to add it. [1]: https://github.com/openstack/kolla/blob/master/docker/nova/nova-base/Dockerfile.j2#L137 Change-Id: I8a802617952f80cfb9f906398054ef6d17559589 (cherry picked from commit 2e6d2f144cd2de18193d9d87d36c95dfb75fb1b7)
2020-05-18Merge "switch to official CentOS 8 repositories" into stable/train9.1.0Zuul6-39/+37
2020-05-17switch to official CentOS 8 repositoriesMarcin Juszkiewicz6-39/+37
RDO builds of stable/train for CentOS 8 went into phase when we do not need to use delorean builds. EPEL is disabled like it is in Ussuri (RDO packages may conflict with it). Erlang for RabbitMQ is used from CentOS 8 'rabbitmq-38' repo while RabbitMQ is still 3.7.* from same place as usual. 'python3-pika' is dropped from openstack-base as it is EPEL only package and is not used by any image (dropped in Ussuri in https://review.opendev.org/#/c/710003/ patch) AArch64 is not supported until CentOS 8.2 release. Change-Id: I9d3ed54f4d10ef7ad2d52ed3aeca15f3968cd163
2020-05-08Use Python 3 for mod_wsgi in cyborg and monasca on Debian/UbuntuMark Goddard2-2/+2
In Train kolla switched to Python 3 in Debian and Ubuntu source images. For services running under httpd with mod_wsgi, they should install libapache2-mod-wsgi-py3 rather than libapache2-mod-wsgi. This was done for most images, but cyborg and monasca were omitted. This change fixes that. Change-Id: I25cfa62dbf20490685617b4a4185bf95ab91725e Closes-Bug: #1873421 (cherry picked from commit f5d31da12fa66cedfc2e270b8cd3be8e2bb9254b)
2020-04-23Add nfs dependencies to glance containerRajat Dhasmana1-3/+7
Glance API image lacked nfs programs/utils to be able to mount NFS exports. This affected Glance usage with Cinder backend when NFS was used as Cinder backend. Closes-Bug: #1868574 Change-Id: I3aac1e6a7f7c5f839b036f15713af949fba206cc (cherry picked from commit cac9d46aa6dbac6631bdcae67db125a88e1c3234)
2020-04-22Merge "CentOS 8: Add rabbitmq-3.7.24 image (CentOS 7 only)" into stable/trainZuul4-0/+89
2020-04-17Merge "Fix that the cyborg database init failed." into stable/trainZuul1-1/+1
2020-04-17Merge "add collectd-pmu, collectd-rtd and collectd-turbostat to C8" into ↵Zuul1-12/+7
stable/train
2020-04-17Merge "Add vitrage-persistor image" into stable/trainZuul1-0/+42
2020-04-16Merge "add dpdk_telemetry and logparser for C8, use centos-release-opstools ↵Zuul2-2/+4
for C8" into stable/train
2020-04-16Merge "Ensure proper JSON in keystone bootstrap" into stable/trainZuul1-1/+3
2020-04-16Fix that the cyborg database init failed.ya.wang1-1/+1
The database init command should be 'cyborg-dbsync upgrade'. Change-Id: I4541c3c070ca70a2ee62f2a0e4ac5d70c57ca6e9 Closes-bug: #1872432 (cherry picked from commit 43de719c3ac17085423b381e5938d1bf83e3ff65)
2020-04-15CentOS 8: Add rabbitmq-3.7.24 image (CentOS 7 only)Mark Goddard4-0/+89
The CentOS 7 rabbitmq image contains 3.7.10, and the CentOS 8 rabbitmq image contains 3.7.24. These versions are not compatible, which prevents a rolling migration from CentOS 7 to CentOS 8. This change adds a rabbitmq-3.7.24 image, available for CentOS 7 images only. This provides a path for migration, by first upgrading all CentOS 7 rabbitmq containers to use this image. Depends-On: https://review.opendev.org/720218 Change-Id: Icff279be07c4767dd0b18c697894373f46102bf1 Partially-Implements: blueprint centos-rhel-8
2020-04-14Ensure proper JSON in keystone bootstrapRadosław Piliszek1-1/+3
This fixes the issue when keystone-manage output included backslashes and/or double quotation marks which broke JSON string. Change-Id: Ifae18c407210c12745d29fc4c95dca69aeafe6a8 Closes-bug: #1866017 (cherry picked from commit 33d184a731458bb45d1206bdae4fb172629a76e7)
2020-04-11Add vitrage-persistor imageQ.hongtao1-0/+42
Kolla was missing vitrage-persistor image required by Vitrage for data storage. Change-Id: Id5e143636f9a81e7294b775f3d8b9134bee58054 Closes-Bug: #1869319 (cherry picked from commit ad06096448a585a16ad73b610b0adc81b597ccec)
2020-04-09Add elasticsearch6 and kibana6 imagesSylvain Baubeau6-0/+85
Elasticsearch and Kibana only support CentOS 8 from version 6.x, but in Train Kolla uses ELK 5.x. This change adds new elasticsearch6 and kibana6 images based on ELK 6.x only for CentOS 7 and 8. This enables two things: 1. provide elasticsearch and kibana for CentOS 8 in Train 2. provide a migration path from CentOS 7 to 8 that does not involve a simultaneous major upgrade, by first upgrading CentOS 7 to ELK 6.x. The new images are based on the upgrade to 6.x in Ussuri in I8b52b2630a72393bf4b9c7095fc67db6c36c27fa. This includes a switch to start using oss tagged binaries. These binaries contain only features that are available under the Apache 2.0 license. Related: blueprint elasticsearch-kibana-version-upgrade Co-authored-by: Dincer Celik <hello@dincercelik.com> Change-Id: I8b52b2630a72393bf4b9c7095fc67db6c36c27fa
2020-04-09add collectd-pmu, collectd-rtd and collectd-turbostat to C8Piotr Rabiega1-12/+7
add collectd-pmu to C7 Change-Id: I1686a110c9166f477216bf7ff9db8ea6e6517917
2020-04-08add dpdk_telemetry and logparser for C8, use centos-release-opstools for C8Piotr Rabiega2-2/+4
Adds collectd-dpdk_telemetry and collectd-logparser packages to collectd RHEL8-based image. dpdk_telemetry plugin collects DPDK ethernet device metrics via dpdk_telemetry library. Logparser is plugin for filtering and parsing log messages. Change-Id: I0c7c94e9fae9d11660f938b8d7d6be0f270c972f (cherry picked from commit 36f6e56d6674c02818e44d5cb3c40660ba2b0644)
2020-04-08Sensu: Remove ceph and process-checks plugins from clientMark Goddard1-2/+0
The sensu image became unbuildable, failing to install the ceph plugin: Unable to resolve dependencies: sensu-plugins-ceph requires english (= 0.6.3) This has happened because the author of the 'english' gem has seen fit to publish a new 0.7.0 release, and 'yank' [1] all previous releases from rubygems. This change removes the ceph and process-checks plugins, which both suffer from a dependency on the yanked english 0.6.3. [1] https://rubygems.org/gems/english/versions/0.6.3 Change-Id: I9d34413fa10b5a2920aca60b08141bfaddcc7415 Closes-Bug: #1871600
2020-04-07Merge "Fix invalid test in cinder data migration script" into stable/trainZuul1-1/+1
2020-04-04Fix invalid test in cinder data migration scriptGauvain Pocentek1-1/+1
The extend_start.sh script for cinder-api uses an incorrect test to check if the MAX_NUMBER variable is set. This leads to a incorrect cinder-manage command being run if this variable is not set, making the database migration fail. This change fixes the test to properly use the MAX_NUMBER variable. Change-Id: Ie46da709db0de09a9cf641b3c154275282f213fc Closes-Bug: #1866827 (cherry picked from commit ff42ff20048ef3b7d2f8df04ada8ff4bf7b710e0)
generated by cgit v1.2.3 (git 2.39.1) at 2026-11-05 20:05:00 +0000