Commit Graph

88 Commits

Author SHA1 Message Date
Michal Arbet 76d78b50c0 Fix gnocchi and skyline after requirements change
Global-requirements changed upper-constraints in [1].
Because of that change skyline and gnocchi build is now failing.

This patch fixes upper-constraints for those projects.

[1] https://review.opendev.org/c/openstack/requirements/+/900435

Change-Id: I09cc2635cd422a859ccded887affb58dfbdc60ad
2024-01-23 08:44:53 +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
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
Marcin Juszkiewicz 1b41f2e682 gnocchi: do not install cradox
Project description says:

/!DON’T USE IT, but use upstream python-rados, except you really can’t /!

Also installing it created errors which are silently ignored.

Change-Id: Id24458cd655aeace0e745c512aa7890b3edda51c
2021-11-02 11:04:50 +00:00
Mark Goddard c29f818696 gnocchi: add python3-rados to gnocchi-base source image
The binary images include python3-rados as a dependency, but source
images do not. This change fixes that.

Change-Id: I2c8cdfcd25856ecdcfd9f302965187b3b62376ad
Closes-Bug: #1927756
2021-05-13 09:06:21 +01:00
Marcin Juszkiewicz 9bad71d7c3 gnocchi-base: numpy provides aarch64 binary wheels
There is no need to install libraries to build Numpy as we have binary
wheel provided by numpy upstream.

Change-Id: I721001f877f6ec2f9a2e425c088a2e22177d2e5b
2021-05-08 11:03:57 +02:00
Marcin Juszkiewicz ffe08baa72 docker: do not install pip again in images
We install pip in base image so why repeat?

Change-Id: Id903880b121d87d75b7b14084b0961b9ce99deba
2021-01-25 16:43:18 +01:00
Gaël THEROND (Fl1nt) b93c40a363 Improve pip install process for offline deployment.
* "Use distribution-provided pip"
    * "Use python's pip module invocation method"
    * "Install pip earlier in order to avoid multiple installation"
    * "Remove pip_version variable requirement and call"

Change-Id: Id0e738044a1931f9d611a7281a48ea4a593f1cf1
Closes-bug: #1893204
2020-09-17 13:50:15 +00:00
Matthias Runge 934d0b21f8 Replace cradox with rados
Gnocchi supports both, but cradox is not actively maintained.

Change-Id: I3d9547237ffa3ee02c306376f0e553fce5472e57
2020-09-06 09:04:14 +00:00
Radosław Piliszek 6319bc6f55 Remove weird deps
This is a follow-up on "Refactor httpd install to base image"
[1].

It seems a copy-paste algorithm was used to craft Dockerfiles
for some httpd-enabled services which resulted in an abundance of
ldappool packages getting installed, even in the 'source' case.
This seems to have also kept ldappool at a lower version because
it did not get updated via pip later.
This patch deals with that and also moves ldap deps for Keystone
to their proper place in 'source' case (extras).
Note Keystone client gets installed in openstack-base.

Cinder does not need to include Keystone either.

[1] https://review.opendev.org/744037

Change-Id: I017d7a6a5d2b1ae6c04556dcf172453a36de5be7
2020-08-11 19:07:09 +02:00
James Kirsch 5bdf514645 Refactor httpd install to base image
Refactor installing and initial setup of httpd and mod wsgi from
individual services to base image.

Change-Id: I651a55a9ebe258ef403d33de010a4dfb368a4021
2020-08-10 09:51:07 +00:00
Zuul ee51c125b3 Merge "gnocchi: install missing python3-wheel package" 2020-04-15 15:50:25 +00:00
Marcin Juszkiewicz e70187c13a gnocchi: install missing python3-wheel package
When there is no cradox wheel available on pypi (for non-x86 archs) then
build fails:

Step 5/8 : RUN pip3 --no-cache-dir install --upgrade cradox     && truncate -s 0 /etc/apache2/ports.conf
 ---> Running in 3a850b4d6319
Collecting cradox
  Downloading f4790a3f5a19b700ff49e14ffa8153/cradox-2.1.2.tar.gz (44kB)
    Complete output from command python setup.py egg_info:
    WARNING: The wheel package is not available.
    WARNING: The wheel package is not available.
    ERROR: Failed to build one or more wheels

Change-Id: I519c2a59208376ae05e0a6f5fa4de303670f2674
2020-04-15 11:46:07 +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
Alfredo Moralejo 0c63129682 Use StorageSIG repos for Ceph in CentOS8
Storage SIG has built Ceph Nautilus and Ganesha for CentOS8 in CentOS
Build System.

Let's switch to use them in kolla.

Change-Id: Id37dca84c4eb918aaf2d3c036ef5387fe75988dd
2020-03-03 16:31:53 +05:30
Christian Berendt 861f55fbfd Add block labels to all Dockerfiles
Change-Id: I9692dda817ef134d647247431565e1b58cf9da41
2020-03-01 17:25:58 +00:00
Mark Goddard 1fe8012ce2 Actually disable EPEL, and epel-modular
The disable_extra_repos macro accepts a list as its only argument. We
were calling it like this to disable EPEL:

disable_extra_repos('epel')

The macro interpreted this as a request to disable three repos, e, p, l.
Thanks Python! Type validation to be improved separately.

Additionally, on CentOS 8 the EPEL repository was not included in the
repository mapping file, repos.yaml. There is also another EPEL
repository on CentOS 8, epel-modular, which is enabled by default after
installing epel-release.

This change adds mappings for epel and epel-modular repos to repos.yaml,
and fixes the disabling of epel in the base image, as well as disabling
epel-modular.

There are some cases where EPEL is still used (it seemed a bit too
easy...), and the repository has been enabled for these images:

* bifrost-base (nginx)
* ironic-conductor (C7 only, shellinabox)
* freezer-base (C7 only, trickle)
* gnocchi-base (C8 binary only, python3-boto3)
* mariadb (pv)
* mongodb (C7 only, mongodb)
* nova-spicehtml5proxy (C7 only, spice-html5)
* telegraf (C7 only, python2-pip)

A few other things were changed:

* ironic-conductor does not require the ceph repo
* python3-pika is no longer installed in the openstack-base image

Related: blueprint remove-epel

Change-Id: I3761825239dfc462072383cde6276c4fb3e1bf12
2020-02-26 13:46:04 +00:00
Michal Nasiadka 70423f1959 CentOS 8: Use upstream Ceph/master
The only Ceph version that will support CentOS 8 is Octopus.
It will be released end of March 2020 - so for now let's use master.

Change-Id: I5955acb41e7346802d76f4f2b244cbf5c36f5bf2
Partially-Implements: blueprint centos-rhel-8
2020-01-30 10:35:50 +00:00
Mark Goddard 8484190e77 Refactor Apache httpd setup
All Apache httpd setup has been moved to a new helper script,
kolla_httpd_setup. This includes the existing clean of /run/httpd,
/var/run/httpd, /tmp/httpd etc.

Horizon has an additional bit of Apache config for Debian/binary, which
has been kept in extend_start.sh for horizon.

Change-Id: Ia2af74b69c151db0bd7e452460b0babcee50b282
Related: blueprint centos-rhel-8
2019-12-11 11:38:46 +00:00
Marcin Juszkiewicz cf11cd6f3d Enable repos only when needed
Disable external repositories by default and enable only when needed.

Depends-on: https://review.opendev.org/696480

Implements: blueprint repos-off-by-default

Change-Id: Icf2a8397a8349e0fe849d88d160409fd234480a9
2019-11-29 11:38:06 +01:00
Eddie Yen 5eb780d0b0 Delete default gnocchi & aodh wsgi conf in Ubuntu binary
Ubuntu distro package will create default wsgi conf in apache
during gnocchi-api and aodh-api installation. We need to delete
them since we only use the conf that pushed by kolla-ansible.

Change-Id: Ib31e733eba12deebdf469c306dfba4191a1b89f5
Related-Bug: 1832306
Related-Bug: 1836520
2019-07-17 14:27:35 +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
Marcin Juszkiewicz 932f09bcd6 create missing apache2 directory on Debian/Ubuntu
Ubuntu/source deployment of several images (horizon, placement-api, zun)
failed with:

+ exec /usr/sbin/apache2 -DFOREGROUND
apache2: Syntax error on line 80 of /etc/apache2/apache2.conf: DefaultRuntimeDir must be a valid directory, absolute or relative to ServerRoot

Change-Id: Ie2a1077f7def0743f1403341985e2109aa490026
2019-06-03 15:11:24 +02:00
Cyril Grosjean 0c732805b1 Add boto3 python dependencies into gnocchi-base image
Adding boto3 python library into gnocchi-base image

Change-Id: I22119f570172ca93de0587dc3892d8b8de86d525
Closes-bug: #1821580
2019-03-27 11:44:05 +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
Jon Schlueter 1d208580b1 gnocchi rpm naming cleanup
During the Queens cycle the gnocci project was
moved out of openstack and so naming changed from
openstack-gnocchi-XXX to gnocchi-XXX

January 2018 - https://review.rdoproject.org/r/#/c/11110/

Also openstack-gnocchi-indexer-sqlalchemy was moved to gnocchi-common

2017 - https://review.rdoproject.org/r/#/c/10449/

Change-Id: I511c248bd009d03cad6811c576dd91a7bb29e203
2019-02-19 08:39:40 +00: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
Martin André 5951977eab Stop using deprecated rpm package names
These packages produce a warning during the installation, we should
switch to their new names, usually to be specific about their use of
python2.

Change-Id: I0a80e822f64222d9a32aabd1fd834bcf794d6320
2018-07-10 16:32:18 +02:00
Farid Da Encarnacao 24f1714a16 Fix Gnocchi support ceph
Based on gnocchi issue #412 [0], cradox is more stable and recommended
to use.

* Add cradox for source and  RHEL family distro binary.
* Ubuntu binary lacks of cradox package, so install from pypi

[0] https://github.com/gnocchixyz/gnocchi/issues/412

Co-Authored-By: Jeffrey Zhang <zhang.lei.fly@gmail.com>
Change-Id: Icf7d6425884fb889d48c786caebbfc7b7050ae8e
Closes-Bug: #1718701
2017-11-28 09:54:15 +08:00
Surya Prakash Singh 6566ace236 Changed as per the standard convention set to use "."
When we have to source a script file use . instead of source
For Reference follow below link:
https://docs.openstack.org/contributor-guide/writing-style/code-conventions

Change-Id: Icc6a692d37e8a5bc1146d803c873505cbf6cd03f
2017-08-28 09:27:45 +00:00
Jeffrey Zhang a8e867b6b4 Use log-file rather than logfile in gnocchi extend start script
logfile is marked as deprecated and will be removed.

Change-Id: Iacd6a0c9667a470ec0ee6b4977100cc8e0b39e27
2017-07-13 01:50:34 +08:00
Nenad Radojevic acf613e91a Add gnocchi-statsd support for Debian systems
The current Docker container for gnocchi-statsd is missing support
for Ubuntu and will fail on start due to missing gnocchi-statsd
package.
Dockerfile extended by the required gnocchi-statsd package.

Closes-Bug: #1700513
Change-Id: I0c5d221f08ae7f1c4a81f83a5ec3fb75e5207b2b
2017-06-27 18:37:11 +02:00
Marcin Juszkiewicz 857ca7033f gnocchi: take care of centos/source on non-x86
As for Debian we need to install blas/lapack devel headers to build
scipy.

Change-Id: I2e0257072192bae6b689d549df12a05196ff7698
Partially-Implements: blueprint multiarch-and-arm64-containers
2017-05-26 12:12:35 +02: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
Jeffrey Zhang c74fb5058f Remove legacy resource types creation
Parameter --create-legacy-resource-types is removed by
Ia7d4ea3d1b9b631ac4c399ae7245e42a531f862a

Change-Id: Ic9580dee9c9c79c4f5d1968a269106067fdb73fc
2017-04-16 17:03:00 +08:00
Jenkins a6b69d6dff Merge "gnocchi-base: add some devel packages for non-x86" 2017-04-10 16:48:30 +00:00
Marcin Juszkiewicz 7fd8f8a4c0 gnocchi-base: add some devel packages for non-x86
On x86_64 pip is fetching precompiled 'scipy' package. On other
architectures we need to build it. For that we need some more
development packages.

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

Change-Id: I173f8daf1aa0aeb1683db08c50b79a0c39f9dc64
2017-04-06 09:44:02 +02: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
Jenkins 6b9a4381a0 Merge "RHEL: Add mod_ssl for services running over httpd" 2017-03-28 13:57:00 +00: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
Eduardo Gonzalez d83e731125 Remove gnocchi-carbonara package
RDO have set carbonara package as obsoleted and is no longer used.
https://review.rdoproject.org/r/#/c/4397/

Change-Id: I5f97ee681f09e194e558eda6291e64d83766f8c1
Closes-Bug: #1676389
2017-03-27 12:13:47 +01: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