summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2020-12-21Fix build of monasca-grafanaMichal Arbet1-12/+13
This patch is adding libffi-dev to build_packages for Debian/Ubuntu which is fixing monasca-grafana build. Change-Id: I67f93687d70f1c8c92719857cbf74971d9a17ae6 (cherry picked from commit 88d48953357c67de14ff83f0361825b05fc71a07)
2020-12-21ceilometer: do not fail when using an unsupported database typeChristian Berendt1-3/+0
This is necessary if e.g. Prometheus is used. Then the ceilometer-upgrade is not needed. Signed-off-by: Christian Berendt <berendt@betacloud-solutions.de> Change-Id: I8690e5543e6b5f37f41fe35f659910fc869c034f (cherry picked from commit ea8592b077ceccfeb3089d901e6f46252f024881)
2020-12-18Merge "Add daxio for nvdimm scenario" into stable/trainZuul2-2/+25
2020-12-18Add daxio for nvdimm scenarioMartin Schuppert2-2/+25
nova-compute uses daxio to cleanup vpmem backend device on instance delete. If the daxio binary is missing in the nova-compute container instance delete fails. daxio is provided in centos via daxio, in ubuntu via the pmdk-tools package. Conflicts: docker/base/apt_preferences.debian Also: nova-compute: daxio on CentOS 8 is x86-64 only Change-Id: Ifb5948653565e2ae902783762e20e33527020efe Closes-Bug: 1907124 (cherry picked from commit 6176d54179109e85dee5ebc29a7726bcb05f76a9) (cherry picked from commit 40a1c7a6ebabb1554e0ce7b54d6b356c2bac1ce5) (cherry picked from commit 14b96abd6f6a6671d4dc97035b9ece61145cdcf2)
2020-12-18mariadb: Fixes incremental backup failure when full not created todayabraden2-3/+17
backup_full() saves the history name in $BACKUP_DIR/last_full_date. backup_incremental() attempts to read from $BACKUP_DIR/last_full_date into $LAST_FULL_DATE. After the read attempt; if $LAST_FULL_DATE is zero length then $(date +%d-%m-%Y) is used. Change-Id: I4172b814d5d95ae3debbc1cf3feaeee2e2bec9bd Closes-bug: 1897948 (cherry picked from commit ccfe65b5f7fe437141f342421488c176038fddb0)
2020-12-17Merge "elasticsearch-curator: drop botocore workaround" into stable/trainZuul1-3/+1
2020-12-17use freezer user for freezer_scheduler containerwuchunyang1-0/+2
freezer scheduler runs with root privilege which is needless Change-Id: I9345a123838dd5ff5a4f4c5d37f40ac233807104 (cherry picked from commit 91cb6166129be975afbd2adc3b43e27931788910)
2020-12-15Support CentOS 8.3abraden5-6/+41
Backport this until Train. CentOS 8.3 renamed system repos. [1] This caused failures when disabling and enabling. More details in the referenced bug report. Notice CentOS 8.2 and below will no longer work. Train backport also includes some fixes for the fallout from the new pip resolver. * cap bandit<1.6.3, since bandit no longer supports Python 2. * mark kuryr-libnetwork unbuildable for source images. * mark almanach-base & dragonflow-base unbuildable for Debian & Ubuntu source images. * Don't install networking-hyperv in source neutron-server images. pip complains of a conflict. (https://bugs.launchpad.net/kolla/+bug/1907826) [1] https://wiki.centos.org/Manuals/ReleaseNotes/CentOS8.2011#Yum_repo_file_and_repoid_changes Change-Id: I2d67b3ed7b7c521bc755ec9a87365c9962a9eeff Closes-Bug: #1907213 Closes-Bug: #1907826 Co-Authored-By: Radosław Piliszek <radoslaw.piliszek@gmail.com> Depends-On: https://review.opendev.org/766211 Depends-On: https://review.opendev.org/767157
2020-12-15elasticsearch-curator: drop botocore workaroundMarcin Juszkiewicz1-3/+1
Curator got requirements sorted out upstream and builds fine now without hack. This reverts curator part of https://review.opendev.org/c/openstack/kolla/+/755339/ Change-Id: Iabe5b9684a7bf0e39a7dca824e6705b5069560bf (cherry picked from commit 7db2f100195c7aecde449e47d758c784850bd456)
2020-12-11Publish weeklyRadosław Piliszek3-3/+3
To better utilise caches during the working week, we decided to publish only weekly (as opposed to daily). This is due to DockerHub-imposed limits. Change-Id: Ib4710dae09e991c0ad21c44a64b2617e0fd4fdc6
2020-12-11[CI] Slim downRadosław Piliszek2-31/+34
Move all extra jobs to the experimental pipeline. Cores should know when to test these extras. This is to reduce the load when a fix is needed in the base image or across all images. Otherwise, due to how CI works, we incur the cost of running all these jobs on each recheck. Change-Id: Ia4aecd2fbe70d1760e0ddc401d06510914dbd1fb (cherry picked from commit 5797c3aa1a0402db9dc159df165b1fe97fc3df45)
2020-12-09[CI] Stop testing lower-constraints and fix py27 jobRadosław Piliszek2-2/+1
This patch disables the lower-constraints job as it started failing and we agreed during the PTG to drop it anyway. [1] For Train and below additionally blacklist bandit 1.6.3 as it was improperly released as a universal wheel. [2] [1] http://lists.openstack.org/pipermail/openstack-discuss/2020-October/018445.html [2] https://github.com/PyCQA/bandit/issues/663 Change-Id: Icfedd16ef9aed84e9f9be939e832c35e0d735efe (cherry picked from commit bc0a41cd02cd11df0907a31f181782cebda74f86)
2020-11-25Bump OpenStack versions for TrainMark Goddard1-5/+5
Change-Id: I1184825371724c9a7d0a47331f3912519d94e8b6
2020-11-06curator: Add wheel to elasticsearch-curatorMichal Nasiadka2-1/+5
boto part cherry picked from change [1]. Disabling mongodb build due to missing packages in CentOS repos. [1]: https://review.opendev.org/755339/ Change-Id: Idf980eedcd318b88101b3a82442b9b99838fd84c (cherry picked from commit 34460d636e9e62f30a0d17eda2d743658ccb0b33)
2020-10-16Merge "Add sysfsutils to nova-compute ubuntu source" into stable/trainZuul2-0/+6
2020-10-16Merge "Bump versions for Train" into stable/trainZuul1-7/+7
2020-10-14Checks for heat_user_domain explicitlyFabian Bermel1-2/+4
The script should check for heat_user_domain explicitly instead of matching on "heat" Closes-Bug: #1839824 Change-Id: Iac83444487d2aa96a0f90086029f43922d1e7856 (cherry picked from commit 5e946cac490077011709c7587dc5e0b06927464f)
2020-10-14Add sysfsutils to nova-compute ubuntu sourceRadosław Piliszek2-0/+6
This fixes the FC Cinder backend usage in Nova. Change-Id: I036cfe3af3dd96625f986a820c78a10e6558b086 Closes-bug: #1884484 (cherry picked from commit 0c8702c96f852eae7a1fb784a260c01c15fb86f3)
2020-10-14Bump versions for TrainMark Goddard1-7/+7
Change-Id: Ib0b3a1a7f6d89e3c70f68024b658ae3526d200f9
2020-10-06Add collectd-libpod-stats to imagepleimer1-0/+1
This patch adds the installation of collectd-libpod-stats as part of the collectd image. The package is available in the centos-opstools repo. Collectd-libpod-stats monitors resource usage of running containers on a host, specifically those managed by the libpod library. Adapted for Train to affect only CentOS/RHEL 8 image. Upstream: https://github.com/pleimer/collectd-libpod-stats Change-Id: I12efbaae9c0795f29c2f68158127509fd1b543b0 Signed-off-by: pleimer <pfbleimer@gmail.com> (cherry picked from commit 094a49d41dd1f071cf5f6ac4220611e0ddd69c40) (cherry picked from commit ce7cd478449227acd0eca7fdd1670624efc22f3b)
2020-09-17Merge "Fix kolla_set_configs --check with a directory" into stable/trainZuul3-5/+53
2020-09-14Fix Masakari dashboard policy file locationMark Goddard2-1/+6
The horizon image copies the masakari dashboard's policy file to Python site packages, but it should go to /etc/openstack-dashboard. This allows the dashboard to be seen by non-admins, although it fails to load. We get an error like the following in horizon.log: No policy rules for service 'instance-ha' in /etc/openstack-dashboard/masakari_policy.json This change fixes the issue. Change-Id: I8ede183c76a830de06ce6524dc3f6f6944b182c1 Closes-Bug: #1894240 (cherry picked from commit 4f44870376f47c6a65bd02cc83d2ef39fd1f5ae9)
2020-09-14Fix kolla_set_configs --check with a directoryMark Goddard3-5/+53
There are several issues with kolla_set_configs --check: 1. We calculate the destination path incorrectly when comparing a file in a directory, due to passing arguments to os.path.relpath in the wrong order 2. For directories that have not changed, we also attempt to compare them as files, which fails when they are open()ed. 3. If the config JSON does not have a config_files key, it fails with a KeyError. The first two issues affect the fluentd container, which specifies directories as the source, without using a glob. The third affects OVN containers. This patch fixes these issues. Closes-Bug: #1890567 Change-Id: I8921befe51da4282121443849177a7ca5ebe8822 (cherry picked from commit c5320eb22386c34d83435fa0b9aa03b178996b52)
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/trainZuul5-9/+24
2020-09-04Use upstream Erlang on CentOS 8Radosław Piliszek5-9/+24
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 Szumski2-1/+6
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-03Bump up versions for trainMichal Nasiadka1-12/+12
Change-Id: Ia4b4c4c2a487e135b100038281ad212789592d14
2020-09-03[CI] Fix wheel url for CentOSRadosław Piliszek1-1/+1
CentOS wheels do not differentiate between minor versions atm. Change-Id: I5365c813bab5e3205fd34eb64dc3337f192d67d4 (cherry picked from commit a3ef68d91c60c9d451450ae0e371e25402bb4c6f)
2020-09-03Revert "openstack-base: pin setuptools < 46 to get horizon working"Radosław Piliszek2-6/+1
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-08-15Updated TGTD to N for centos8James Benson1-1/+1
Change-Id: I1fa10cd7a0ee78613d2763c804ecefb2e5e8e75e closes-bug: #1891685 (cherry picked from commit 8233a56473056de2b5f26b93083899006e80edec) (cherry picked from commit 69c0ff8491ac7b7f30410a2b3c1f575cec3c00b0)
2020-07-27Fix masakari-monitors image on CentOS 8Mark Goddard3-1/+5
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 Bezak2-0/+18
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 Baldessari2-1/+9
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/trainZuul5-0/+52
2020-07-01Merge "Update support matrix for ELK images" into stable/trainZuul2-6/+12
2020-07-01Merge "Add Logstash 6 for Monasca on Centos 8" into stable/trainZuul5-0/+50
2020-06-29Merge "add libibverbs package for openvswitch" into stable/trainZuul2-0/+2
2020-06-28Add Elasticsearch Curator Docker imageDoug Szumski5-0/+52
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-26Merge "Fix Monasca Agent Statsd service under Py3" into stable/trainZuul2-1/+5
2020-06-26Update support matrix for ELK imagesDoug Szumski2-6/+12
Centos 8 forced the upgrade of Elasticsearch from 5 to 6 in Train. This forced the upgrade of Logstash and Kibana. Partial-Bug: #1884090 Change-Id: Ide308f7973db1f97b410ecae7d9ab049156afb7a
2020-06-25Fix loading of Storm on Centos8 / Python 3Doug Szumski2-0/+12
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 Szumski5-0/+50
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-25Fix Monasca Agent Statsd service under Py3Doug Szumski2-1/+5
Pulls in this fix: https://review.opendev.org/#/c/736610/ Partial-Bug: #1885104 Change-Id: I014c9a52b2f61a86e3a8adafdf4783c3f58148ef