Commit Graph

114 Commits

Author SHA1 Message Date
Michal Nasiadka 66e27b3b0a Remove calls to libvirt repo
It does not exist in repos.yaml since [1].

[1]: Id585c7744ba130ad1dfc28138fb0f9e6eeae771d

Change-Id: Ic74eba44fc6e5508976de24cf20a5039f3292731
2024-02-26 13:04:19 +01:00
Michal Arbet 7f5a904e98 Fix openstack CADF audit maps and installation
This patch fixes missing pycadf's audit maps
for services and change the way how pycadf
is installed.

Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/905858

Closes-Bug: #2047941
Change-Id: I9b43d1a9990ad8aa7381ea81b0f2d692967be949
2024-01-17 11:52:20 +00:00
Marcin Juszkiewicz 19e40f1608 docker: implement macros to alter upper-constraints.txt
upper_constraints_remove() macro allows to remove line
upper_constraints_version_change() allows to change versions

This way we have cleaner way to alter u-c in those images which need it.

Change-Id: I8fc354b8aa4d03fcd3ecfb9cbfe75de67492a0e3
2023-04-21 14:13:24 +02:00
Radosław Piliszek 2daf4331a6 Fix writable rootwrap/privsep config
Fixes a hypothetical security issue related to privilege escalation via
rootwrap/privsep. A potential vulnerable service could previously allow
writes to its rootwrap/privsep config and thus allow for more commands
to be run with root privileges via rootwrap/privsep. For a succesful
attack, this would also require the service to allow to run arbitrary
commands via rootwrap/privsep. Thus far, no such vulnerabilities have
been reported and thus this fix is simply strengthening the container
images against such an issue in the future.

Change-Id: I92c81c77e6a16570a108cde8031f7977930fb02a
Closes-Bug: #1874298
2022-10-10 15:06:05 +00:00
Marcin Juszkiewicz 016c5ed30c adjust permissions on _extend_start files (part II)
Tim Shearer started it in 1d96a2bbe1.

Since all extend_start files are sourced rather than executed, the executable
bits are now cleared throughout the project.

Change-Id: Ia1797c32fc6a35f9f077c673abf4d8e16e51a760
2022-04-22 11:34:55 +02:00
Marcin Juszkiewicz e21aeb5ae9 flatten images a bit
As we have one type of images now some RUN calls could be merged so we
will have less layers in resulting images.

Change-Id: I5178c58fbd8c65efe825dc249c0f1368ef0fe8e0
2022-04-21 18:53:14 +00:00
Tim Shearer 1d96a2bbe1 Adjust permissions on _extend_start files.
Explicitly set the permissions on the kolla-toolbox kolla_extend_start
file. Also, since all extend_start files are sourced rather than
executed, the executable bits are now cleared throughout the project.

Change-Id: I5c2deb4a2e33575d57c852089f856a9acc6818d0
2022-04-11 17:22:24 +02:00
Marcin Juszkiewicz 1749da2fbf docker: drop binary parts
Big patch drops all mentions of binary images support. Suggestions are
welcome how to split it into parts or handle better.

Change-Id: I5d5a46c6ce7734ceb8b844e17b43e359d7cac6e3
2022-04-09 17:44:26 +02:00
Radosław Piliszek d55cd5e5c2 Remove last mongo refs
Drop installation of pymongo because it is not used by Telemetry
since at least Queens [1] [2] and MongoDB is not deployed by
Kolla Ansible since Victoria.

[1] https://review.opendev.org/c/openstack/ceilometer/+/512700
[2] https://review.opendev.org/c/openstack/aodh/+/373043

Change-Id: Id44ab0fe673f01490cd8ca9c51f465ae7ad95e08
2021-06-29 13:50:17 +00:00
Matthias Runge e9ec89821e Remove panko
Panko has been deprecated and removed from OpenStack. Only
stable branches are maintained.

Change-Id: Ie35f92737ef36531d7bdc6b9245d529be8096c9c
2021-06-11 17:50:27 +02:00
Marcin Juszkiewicz fb61ba7dac enable 'libvirt' repo for images with python*-libvirt
There are several images installing 'python3-libvirt' package. Which for
Debian reside in 'libvirt' repo. So let's enable it where needed.

Change-Id: I1c91d27f2578f5ca7c83c4747725b1d9371880b0
2021-03-23 22:08:11 +01:00
Christian Berendt ea8592b077 ceilometer: do not fail when using an unsupported database type
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
2020-11-27 11:37:52 +01:00
Radosław Piliszek 69b8b7a49f Fix ceilometer-upgrade params
It seems [1] has introduced a slight regression in that it tries
by default to pass an empty string to ceilometer-upgrade which
makes it fail:

ceilometer-upgrade: error: unrecognized arguments:

(note there is nothing more on that line)

This patch fixes that by allowing the params to be of any number,
including zero.

Backport to Ussuri.

[1] 3d587409ee

Change-Id: I989a1dd30d1656b5c1fda7a46abbf5f265fbb72c
Closes-Bug: #1884919
2020-07-09 16:52:55 +02:00
Zuul 2f66efdf5e Merge "Remove support for CentOS 7" 2020-04-15 14:02:57 +00:00
Marcin Juszkiewicz 53443c5c71 Remove support for CentOS 7
With the move to RHEL/CentOS 8 we no longer have Python 2 in our images
so there is no need for checking which Python version (2.x or 3.x) is
used inside of containers.

We also no longer have to support yum as a value for
distro_package_manager.

Partially-Implements: blueprint centos-rhel-8

Change-Id: Ie45cf3465fedddbde7856961527421883ba3d5c9
2020-04-15 09:32:06 +00:00
Rafael Weingärtner 3d587409ee Allow operators to use "ceilometer-upgrade" parameters
Allow operators to use custom parameters with the ceilometer-upgrade
command. This is quite useful when using the dynamic pollster subsystem;
that sub-system provides flexibility to create and edit pollsters configs,
which affects gnocchi resource-type configurations. However, Ceilometer
uses default and hard-coded resource-type configurations; if one customizes
some of its default resource-types, he/she can get into trouble during
upgrades. Therefore, the only way to work around it is to use the
"--skip-gnocchi-resource-types" flag. This PR introduces a method for
operators to execute such customization, and many others if needed.

Change-Id: Ice42d936476635b627b21dc8676fb7bc560cd3a9
2020-04-11 09:49:41 +00:00
Christian Berendt 861f55fbfd Add block labels to all Dockerfiles
Change-Id: I9692dda817ef134d647247431565e1b58cf9da41
2020-03-01 17:25:58 +00:00
Mark Goddard 4b4e26262b CentOS 8: Update packages in images
* Some further changes for python2 vs python3 packages
* Allow rabbitmq 3.7.*, since a newer erlang is available
* Switch from qemu-img-ev to qemu-img on CentOS 8
* bridge-utils no longer available on CentOS 8
* libvirt-daemon-driver-lxc no longer available on CentOS 8
* Mark some more images buildable for CentOS 8

Change-Id: Iaf5b68ff6d944ae730ca0b1d5832172c106a6c08
Partially-Implements: blueprint centos-rhel-8
Partially-Implements: blueprint centos-rhel-python-3
2020-01-29 11:41:38 +00:00
Zuul 17ce7d4de6 Merge "Debian/Ubuntu: more python3 packages for binary" 2019-06-07 08:29:09 +00:00
Mark Goddard aa59f0db6f Debian/Ubuntu: more python3 packages for binary
backport: Stein

During the switch to Stein UCA, we did not switch all packages to python
3 for Debian/Ubuntu binary images. This change switches some more of
those packages.

Change-Id: I0bff21384d88ea678608392de2db1ba418c96665
Co-Authored-By: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
2019-06-06 11:06:58 +00:00
Marcin Juszkiewicz d436001b43 Debian/Ubuntu: move to Python 3 for source images
Commit 43b74ccc15 enabled use of Python 3
based packages but not switched to use Python 3.

Some of images still contain Python 2. There are two reasons:

- Ceph (ceph-common depends on Py2)
- python3-ldappool on Ubuntu 18.04

In Ceph situation Py3 packages were added. For second one we can not do
anything - Py2 dependency got dropped in Ubuntu 18.10 version.

Removed neutron-server-plugin-networking-infoblox due to being not
maintained. Once https://review.opendev.org/#/c/657578/ get merged
someone may revert that part.

Implements: blueprint debian-ubuntu-python3

Depends-on: Ie2a1077f7def0743f1403341985e2109aa490026

Change-Id: Ibfe0c2b8be98db56c61f74fb0247488ab3749ef4
2019-06-06 11:59:03 +01:00
Alex Schultz 3e5d8e2653 Add python3 packages for RHEL systems
RDO is currently working on python3 support for the next version of
CentOS/RHEL based systems.  This package uses the distro_python3 flag
that was added as part of I4028991bad92c0e8e21066cc4173c06ce5eba393 to
use the python3 specific package names.  This change only adds python3
package names for RHEL systems.

Conflicts-With: https://review.openstack.org/#/c/636457/
Change-Id: Iad6b70b433a0dd1b0f8ae6790fd280594517661a
Related-Blueprint: python3-support
2019-03-12 17:48:18 +00:00
Marcin Juszkiewicz 43b74ccc15 debian/ubuntu: make use of Python3 based packages
Both Ubuntu Stein UCA and Debian 'buster' migrated their OpenStack
packages to Python 3.

Note that Debian 'buster' is not released yet and contains Rocky
packages. Stein ones will be available later.

Co-Authored-By: Lee Yarwood <lyarwood@redhat.com>
Co-Authored-By: Eduardo Gonzalez <dabarren@gmail.com>

Change-Id: I160f79cc57f54ec3eac857c5babd1a6e2656d228
2019-02-28 13:06:24 +01:00
Alex Schultz ae1322ec10 Use base_package_type
This change updates the docker files to use base_package_type instead
of doing specific distro checks for the rhel/deb generic cases. The
base_distro is still available and is used when a specific distro needs
a customization but if the differences are purely rpm vs deb, then the
base_package_type can be used.

Change-Id: I8d720bb185df65a0178061ccf20b1ab2265da2c5
2019-01-17 08:23:41 -07:00
Eduardo Gonzalez fc7eb5a9c7 Test Fix ceilometer source builds
Remove ceilometer from constraints to fix the build.

Change-Id: I992cf177944df8da3026a8b3deabf5f10051959c
2018-09-18 14:20:40 +00:00
ZhijunWei 5695a65270 Fix the ipmitool missing for ceilometer-ipmi image
To enable IPMI meters, ensure IPMITool is installed[0] and
the host supports Intel Node Manager.

[0]: https://docs.openstack.org/ceilometer/latest/install/install-compute-rdo.html
Co-Authored-By: caoyuan <cao.yuan@99cloud.net>

Change-Id: I45b66277c31a4d0e33e0c14e01313aa688287ec7
Closes-Bug: #1767750
2018-05-14 16:35:32 +00:00
chenyaguang 71a34b6da3 Ceilometer notification container start failed
There is no need with /etc/apache2/envvars for ceilomter_notification

Change-Id: I00f91dca3763a33f77be2a1968047126504feb55
2018-04-03 17:10:29 +08:00
Alexandru Bogdan Pica 603a733879 Fix ceilometer deployment
This change fixes the following issues:

- wrong sudoers command
- bad arguments for ceilometer-upgrade
- removes the deprecated storage backends,
  as per https://review.openstack.org/#/c/512700/

Please note that due to the aforementioned issues, ceilometer
deployment was failing. I first encountered this issue when
attempting to upgrade from pike to queens.

Change-Id: Ibdfed9ea0a8e4aaf4fe3420a5885ea346998f1e7
Closes-Bug: 1741536
2018-02-12 11:14:44 +02:00
Pradeep Kilambi 5abc87e681 Drop ceilometer client package requirement
ceilometer api and client are dead in queens. lets drop this
client.

Change-Id: I1d2b31977f05c3a912d8704caa019c02c784556e
2018-01-12 11:05:35 -05:00
Jeffrey Zhang 9ebd3bcfd5 Remove ceilometer-collector image
ceilometer collector is remove from ceilometer code base[1]

[1] https://review.openstack.org/504244

Change-Id: Id15d4d881b0fddcbc5e3f6afd6221a49e15ae704
2017-12-28 14:25:34 +08:00
caoyuan cd679300a2 Remove the ceilometer api dockerfile
1. Ceilometer API has been deprecated since Ocata release,
this patch to remove it for kolla
2. move the extend_start.sh into eilometer-notification

Change-Id: Iea0a46aead14e238fe102d4127b7774dbc2be0e4
2017-12-14 20:11:19 +08:00
Jeffrey Zhang f17c796c52 Remove the installed packages in ceilometer-api container
ceilometer-api process is removed already. Kolla use ceilometer-api
container to bootstrap service. Since all the required packages is
installed in ceilometer-base, just remove all the packages in it.

Change-Id: Iddae52d22e54aef5fdd31d77829d7008ee0bc69b
2017-11-14 15:28:43 +00:00
Jeffrey Zhang 17c5123fda libvirt should be installed from OS rather than pip
python-libvirt need be compiled with libvirt header. compiling
it with different libvirt header may be failed.

So better install python-libvirt from OS distro.

Closes-Bug: #1707841
Change-Id: I0d7bf1576aaf24fc7c60f49923e37a6a1afe9a8e
2017-08-15 17:17:32 +08:00
Jeffrey Zhang 92ed026c27 Remove python-wsme and python-pecan packages for centos
These two packages are installed when install
openstack-ceilometer-common[0]

[0] http://paste.openstack.org/show/616140/

Change-Id: Iac9947dda030d6013a1078ca75c76b72c4cacc6e
2017-07-21 10:21:27 +00:00
Mathias Ewald c8c6042364 Fix apache configuration for ceilometer_api
Removes ceilometer-api vhost configuration from apache that comes with
ubuntu package to avoid errors resulting from duplicate configurations

Remove configuration from apache's sites-enabled configuration

Change-Id: I63d7395b134fc815355447f871436a4e8960d015
Closes-Bug: #1695875
2017-06-20 11:28:26 +02:00
Jenkins 082e2f4f8c Merge "Add ceilometer agent ipmi docker file" 2017-06-02 10:59:30 +00:00
Pradeep Kilambi cd04dc84d0 Add ceilometer agent ipmi docker file
Change-Id: Id46e36b2bb57e03ce477254e7a853836a278a8c0
2017-05-09 08:16:18 -04:00
Jawon Choo 31259fa595 Override image's meta info.
centos based images have wrong label info,
these changes fix own image's name and build-date.

Change-Id: I1d13f8f386c8db12b5fbe5f8ecbbf9e3fbb4ba1c
Closes-Bug: #1680341
2017-05-03 11:08:17 +09:00
Chen 8c463a47a9 Use LABEL instead of MAINTAINER (deprecated) in all Dockerfile.j2
Use LABEL instruction instead of MAINTAINER (deprecated) instruc-
tion as suggested by Docker's official dockerfile guide.
docs.docker.com/engine/reference/builder/#maintainer-deprecated

Closes-Bug: #1683652

Change-Id: Ie87a1ddf31aefcd0b623fd2837d78de420e76898
2017-04-20 16:50:05 +09:00
Jenkins c8675119c3 Merge "Install panko in ceilometer base container" 2017-04-12 11:28:21 +00:00
Marcin Juszkiewicz 69fef5cd59 debian: enable all images enabled for Ubuntu
Debian support is not maintained in Kolla so it got a bit behind Ubuntu
one. This changeset enables Debian for all images. Jessie (even with
backports) may be too old for some images though.

Also unify distro check to ['debian', 'ubuntu'] to keep alphabetical order
like it is done for RPM distributions.

Partially-Implements: blueprint multiarch-and-arm64-containers

Change-Id: I056233fbfa277e0e2360c07c3f80d9558c554357
2017-04-04 22:48:18 +02:00
Eduardo Gonzalez 623e54da37 Alphabetize packages
Some images have packages sorted alphabetically and some not.
Unify common style between all images.

Change-Id: I906ed89c10b12886665618752f525ba71d83d991
2017-03-28 16:45:16 +01:00
Juan Antonio Osorio Robles 9df58642c6 RHEL: Add mod_ssl for services running over httpd
This apache module is necessary for when one wants to use TLS for the
services running over httpd.

This only addressed RHEL based systems at the moment, since there is no
such package available for Ubuntu. This requires apache2.2-common which
will carry a lot more dependencies; So I think this should be handled
and decided in a separate patch.

when installing mod_ssl in RHEL-based distributions, an ssl.conf file is
installed in the /etc/httpd/conf.d directory. This file tells httpd to
listen on port 443; however, we don't want to do this by default, since
this should be explicitly enabled by the container's configuration. This
line is thus removed from the configuration.

A release note was added, which specifies this. And the last sentence
can be removed if this is addressed for debian/ubuntu as well.

Related-Bug: #1675490
Co-Authored-By: Martin André <m.andre@redhat.com>
Change-Id: Id6215d31547247309d43c031e163fa9e4c4ec5dc
2017-03-27 14:52:45 +03:00
Jeffrey Zhang 5558bd53fb Install panko in ceilometer base container
When using panko event dispather in ceilometer, panko's code is
required.

Closes-Bug: #1672241
Change-Id: Ie03f6fcda0ecd09511c09c962b9bd14ae67f1ad3
2017-03-13 12:36:06 +08:00
Duong Ha-Quang a8932157f7 Fix missing python modules in Ceilometer
The dependencies of ceilometer packages missed
python pecan and wsme.

Change-Id: Ia0d7b8de530f42a1d84e455486fb4b66ff833914
Closes-Bug: #1668548
2017-03-07 09:22:02 +07:00
Chao Guo 961224c6cf Use install-pip macro in most source images
1. Enable customization of pip packages in source
branch of most images
2. All pip packages install uniformly through
install-pip macro, user can easily customize his
own pip command (For example using a mirror)

Co-Authored-By: Mauricio Lima <mauriciolimab@gmail.com>
Change-Id: If09582039f690fa4136e8f33200d5da15e092da7
2017-02-17 08:49:32 -03:00
Jeffrey Zhang e5903d5fa9 Remove include_header and include_footer in all Dockerfiles
include_header and include_footer parameter is already removed, remove
them in all Dockerfiles.
Add missing footer block.

Change-Id: I90da03eb9f95a3827361d5f5ede65fde7d6be2b3
2017-02-05 10:44:48 +08:00
Jeffrey Zhang 68be691ffd Remove skip-event-database parameter in ceilometer
skip-event-database parameter is removed by
I179eb0d436752e3bb8abaed714664cf74f5615e6

Change-Id: I69b782ae4db373ccefedf39b988c362583077df9
2017-02-01 12:20:43 +08:00
zhubingbing a021deaaf0 Fix code format ceilometer_compute dockerfile
Change-Id: Ia35a39f34adbba66af1bd1983cfc54e5d165bb90
2017-01-28 08:21:11 +00:00
Sam Yaple 58eee09c15 use static uid/gid in images
This centralizes all user and group creation into a single source. This
will fix any current and furture uid/gid mismatches (such as with
nova-libvirt).

In the process, we also unify users between the distros in a standard
way. The users in the following containers change from thier defaults:

Ubuntu: _chrony user is now chrony
Ubuntu: memcache user is now memcached
All: qemu user is used for ownership and socket permissions

All uid and gid numbers are customizable via kolla-build.conf

Co-Authored-By: Kris Lindgren <klindgren@godaddy.com>
Change-Id: I120f26ab0683dc87d69727c3df8d4707e52a4543
Partially-Implements: blueprint static-uid-gid
2017-01-17 09:02:21 -03:00