aboutsummaryrefslogtreecommitdiff
path: root/docker/gnocchi/gnocchi-api
AgeCommit message (Collapse)AuthorFilesLines
2026-07-06Migrate to pyproject.tomlMichal Nasiadka2-24/+0
[tool.setuptools.data-files] does not support recursive directory installation. The old setup.cfg [files] worked because PBR's FilesConfig.expand_globs() used os.walk() to expand docker/*, but this hook is not triggered by the pbr.build PEP-517 backend. Move docker/ into kolla/ and use [tool.setuptools.package-data] instead. Update kolla_worker._get_images_dir() to check the kolla package directory first so both editable and regular installs work. Change-Id: I4fc452c03740ef22ebbb4e8d0d86c4f4783e2d09 Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
2026-06-24kolla-build: fix build-date LABEL invalidating Docker layer cacheMichal Nasiadka1-1/+1
The build-date label was rendered into a LABEL instruction on line 3 of every Dockerfile template, immediately after FROM. Because Docker invalidates the cache for a changed instruction and all subsequent layers, a date change caused a full rebuild of every image on each new calendar day, even when nothing else had changed. Fix this by removing build-date from the Dockerfile templates and applying it as a --label argument at build time via image.labels. Labels passed on the build command line are not part of the Dockerfile cache key, so the date is still recorded in the image metadata without affecting layer caching. Change-Id: I8ef0d85bab1a999a4d09f7cbf0c088ca00fdcf77 Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
2026-04-28Remove httpd_setup calls from api containersMichal Nasiadka1-2/+0
We have dropped mod_wsgi support from services in [1]. [1]: https://review.opendev.org/c/openstack/kolla-ansible/+/982414 Change-Id: Ie5da8427706dfb74bad4e174c990355a6870114c Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
2024-11-15Add mechanism for patching files in containersMichal Arbet1-0/+2
This patch adds a way to patch files in a Docker image built by Kolla. This is very useful for several reasons, specifically: - Custom modifications - The stable branch of some library has a fix but no pip package has been released - Eliminates the need to package your own pip packages - Eliminates the need to invent your own versioning to prevent upstream versioning - Eliminates the need to manage a pip server - In other words, it eliminates the need to get a wheel into the image and install it manually using any method not previously mentioned It is also highly desirable because, although Kolla can replace the source for a service with a custom URL for a tarball or its own Git repo, it cannot do this for dependencies pulled from pip. I would also like to point out that this is a feature with its own code path and works only if the user "inserts" a patch into the folder patches/docker-image/something.patch and creates an analogous series file for patch source code. Simply said, this code will never interfere with the upstream build process since this feature is not intended for use in upstream. It is rather meant for downstream users who know what they are doing. Now they just have an option to patch their images. Everything works on all layers of the Docker image and stores a report of applied patches which can then be seen in /etc. This mechanism is similar as debian patch quilt. Change-Id: I61d0790c5d4d070b7ea9e8c99c0a76ff5d22bf9d
2022-04-22adjust permissions on _extend_start files (part II)Marcin Juszkiewicz1-1/+1
Tim Shearer started it in 1d96a2bbe1b536b7d7f4cdbf55c6dabae6d058ae. Since all extend_start files are sourced rather than executed, the executable bits are now cleared throughout the project. Change-Id: Ia1797c32fc6a35f9f077c673abf4d8e16e51a760
2022-04-09docker: drop binary partsMarcin Juszkiewicz1-16/+0
Big patch drops all mentions of binary images support. Suggestions are welcome how to split it into parts or handle better. Change-Id: I5d5a46c6ce7734ceb8b844e17b43e359d7cac6e3
2020-03-01Add block labels to all DockerfilesChristian Berendt1-0/+2
Change-Id: I9692dda817ef134d647247431565e1b58cf9da41
2019-12-11Refactor Apache httpd setupMark Goddard1-11/+2
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-07-17Delete default gnocchi & aodh wsgi conf in Ubuntu binaryEddie Yen1-0/+4
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-06-03create missing apache2 directory on Debian/UbuntuMarcin Juszkiewicz1-0/+1
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-02-19gnocchi rpm naming cleanupJon Schlueter1-2/+2
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-01-17Use base_package_typeAlex Schultz1-2/+2
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
2017-08-28Changed as per the standard convention set to use "."Surya Prakash Singh1-1/+1
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-07-13Use log-file rather than logfile in gnocchi extend start scriptJeffrey Zhang1-1/+1
logfile is marked as deprecated and will be removed. Change-Id: Iacd6a0c9667a470ec0ee6b4977100cc8e0b39e27
2017-05-03Override image's meta info.Jawon Choo1-1/+1
centos based images have wrong label info, these changes fix own image's name and build-date. Change-Id: I1d13f8f386c8db12b5fbe5f8ecbbf9e3fbb4ba1c Closes-Bug: #1680341
2017-04-20Use LABEL instead of MAINTAINER (deprecated) in all Dockerfile.j2Chen1-1/+1
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-16Remove legacy resource types creationJeffrey Zhang1-1/+1
Parameter --create-legacy-resource-types is removed by Ia7d4ea3d1b9b631ac4c399ae7245e42a531f862a Change-Id: Ic9580dee9c9c79c4f5d1968a269106067fdb73fc
2017-04-04debian: enable all images enabled for UbuntuMarcin Juszkiewicz1-1/+1
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-03-27Remove gnocchi-carbonara packageEduardo Gonzalez1-1/+0
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-02-05Remove include_header and include_footer in all DockerfilesJeffrey Zhang1-1/+0
include_header and include_footer parameter is already removed, remove them in all Dockerfiles. Add missing footer block. Change-Id: I90da03eb9f95a3827361d5f5ede65fde7d6be2b3
2016-11-03Remove Fedora supportChristian Berendt1-1/+1
Closes-bug: #1616387 Change-Id: Id97f88b9baa3d48d33ce120962450a374282d044
2016-11-02Fix gnocchi deploybjorn lofdahl1-1/+1
Gnocchi deploy fails due to sudo -i flag Change-Id: Id1e2af274a3aee43dfecf02f979a9584dd2cffa8 Closes-Bug: #1634148
2016-09-29Fix error in Gnocchi serviceJeffrey Zhang1-1/+1
* mount gnocchi volume for gnocchi-api and gnocchi-statsd * fix the failed of gnocchi-api * use gnocchi user when running gnocchi-upgrade * use the app.wsgi file in python path directly, rather than copy it to /var/www/cgi-bin/gnocchi/app file TrivialFix Change-Id: Ie026b8f44cd8e9703bf115cebb4e2d50b114a3a2
2016-09-13Add header blocks to all DockerfilesPaul Bourke1-0/+3
Change needed to add header blocks to all Dockerfiles, similar to the base. Use case is to easily run something before packages are installed, e.g. to COPY a local rpm in that can be added to the package list. Change-Id: I1bbfdf0b762da0a392aa8bf47781315b45377bee Closes-Bug: 1618969
2016-09-01repair gnocchi dockerfilezhubingbing2-3/+11
1. Add the missing packages in the gnocchi image packages: lz4 sqlalchemy_utils gnocchiclient 2. gnocchi config path is error gnocchi config path is /gnocchi/etc/gnocchi 3. gnocchi sync db command is error sync db command is: gnocchi-upgrade Reference link: http://docs.openstack.org/developer/gnocchi/install.html 4. gnocchi log directory is /var/log/kolla/gnocchi 5. Add gnocchi-api running as a mod_wsgi Reference link: http://docs.openstack.org/developer/gnocchi/running.html 6. Add gnocchi sudoers file Closes-Bug: #1607332 Change-Id: Id3aded82706ffd204373c97a020980d0d9b72663
2016-08-19Handle empty package list for install_packagesShaun Smekel1-1/+1
Currently if the install_packages macro is run with an empty package list, it will add a yum or apt-get command with no packages listed. This bug fix aims to omit this line when no packages have been given, or, the operator wants to use the "_override" / "_remove" functionality to disable all packages being installed in a Dockerfile. Co-Authored-By: Paul Bourke <paul.bourke@oracle.com> Change-Id: Ifaaaebfccc3adb0f2f68a35ac08e59378bc87fdb Closes-bug: 1612446
2016-07-23Customizations for gnocchiSwapnil Kulkarni (coolsvap)1-14/+12
This patchset contains customization of Dockerfiles of gnocchi containers Change-Id: I39f3cc44664225d3e7cbb735a7b70d5cd0f7ec47 Partially-implements: blueprint third-party-plugin-support
2016-06-01Updated Gnocchi binary containersSwapnil Kulkarni (coolsvap)1-0/+6
Added ubuntu binary containers Added gnocchi-metricd which is new package in centos and ubuntu Change-Id: If21d705e8bd1e34ea894c83ae42b0c8ef20510d7 Depends-On: If4be00b937e14ec93443dcb7249cf17099d57cbe Closes-Bug:#1582523
2016-04-12Update Gnocchi dockerfiles for formattingSwapnil Kulkarni (coolsvap)1-1/+1
Change-Id: I9a3560e3ec207f5aff0a0d8e608ab481989a8d82 Partial-Bug:#1569417
2016-01-15Remove old config-external.shWanlong Gao1-10/+0
TrivialFix Change-Id: Ib1923d8782699904cbc6a71d2f326d9c207d0005
2015-11-23Merge "Remove hardcoded MAINTAINER in Dockerfiles"Jenkins1-1/+1
2015-11-23Remove hardcoded MAINTAINER in DockerfilesSwapnil Kulkarni (coolsvap)1-1/+1
Added new option in kolla-build.conf Change-Id: I45fe51966bcb59ea19d112281ba3d5a1ba091a56 Closes-Bug:#1514304
2015-11-23Drop root for gnocchiSwapnil Kulkarni (coolsvap)2-1/+3
Updates to ensure commands run in the gnocchi containers are done as the 'gnocchi' user rather than root. Change-Id: I2e24300e05d1b2eeaa52bdc6ed3ec4599791136e Partially-Implements: blueprint drop-root
2015-10-13Fix issue with su and bad kernelsSam Yaple1-1/+1
Long story short, some kernels before 3.15 had an issue with using su in a container when the network namespace was --net=host. The gate has a 3.10 and a 3.13 kernel and has a problem with this. This changes everything to use sudo backport: liberty Partially-Implements: blueprint functional-testing-gate Change-Id: I4d79ccaa1cddffcc8393f64e7e1be2538efe33e5
2015-10-06Bring Kolla inline with FHSSam Yaple1-1/+1
This brings Kolla images inline with FHS and should make finding locations of things more consistent and reliable with the linux world at large. Change-Id: Iece5b4da4bace0fb8b1f41a65ab2c852ec73e6f8 Closes-Bug: #1485742
2015-10-06Common start.shSam Yaple2-14/+2
The majority of the start.sh code is identical. This removes that duplicate code while still maintaining the ability to call code in a specific container. The start.sh is moved into /usr/local/bin/kolla_start in the container The extend_start.sh script is called by the kolla_start script at the location /usr/local/bin/kolla_extend_start . It always exists because we create a noop kolla_extend_start in the base directory. We override it with extend_start.sh in a specific image should we need to. Of note, the neutron-agents container is exempt from this new structure due to it being a fat container. Additionally, we fix the inconsistent permissions throughout. 644 for repo files and the scripts are set to 755 via a Docker RUN command to ensure someones local perm change won't break upstream containers. Change-Id: I7da8d19965463ad30ee522a71183e3f092e0d6ad Closes-Bug: #1501295
2015-09-28Merge "Implement a install_type and install_metatype"Jenkins1-1/+1
2015-09-28Implement a install_type and install_metatypeSteven Dake1-1/+1
This prepares for the RHEL OSP implementation by making the build tool convert all binary-* into an install_type of binary and * into an install_metatype variable substitution inside the Dockerfiles. Further binary-* is substituted as install_name to enable proper building only. Change-Id: Ib681b29176eb79a3cab12ec824313fdecb6e7a5f Partially-Implements: blueprint rhel-based-image-support
2015-09-27remove set_configsSam Yaple1-3/+0
Change-Id: I9bb0a1fac63cc326234b0f06b1e56b43e0753279 Partially-Implements: blueprint replace-config-external
2015-09-04Add 'rhel' for RPM distrosSteven Dake1-1/+1
Add 'rhel' to list for RPM based distros. Also sort the distro list for rpm packages for affected lines. Change-Id: Ied4cb3e9763d6c6359f314d16185383ac3e006ed Partially-Implements: blueprint rhel-based-image-support
2015-08-28Move docker_templates to docker dirSam Yaple3-0/+52
Updated build.py to reflect this change. Deprecate --template option and make it a noop. Change-Id: I7cd98d1ee684a4c64984a49597159868152683b2 Partially-Implements: blueprint remove-docker-dir
generated by cgit v1.2.3 (git 2.39.1) at 2026-11-05 21:04:24 +0000