aboutsummaryrefslogtreecommitdiff
path: root/docker/ceilometer/ceilometer-api
AgeCommit message (Collapse)AuthorFilesLines
2017-12-14Remove the ceilometer api dockerfilecaoyuan2-36/+0
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-11-14Remove the installed packages in ceilometer-api containerJeffrey Zhang1-61/+0
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-06-20Fix apache configuration for ceilometer_apiMathias Ewald1-1/+3
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-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-04debian: enable all images enabled for UbuntuMarcin Juszkiewicz1-2/+2
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-28Alphabetize packagesEduardo Gonzalez1-7/+7
Some images have packages sorted alphabetically and some not. Unify common style between all images. Change-Id: I906ed89c10b12886665618752f525ba71d83d991
2017-03-27RHEL: Add mod_ssl for services running over httpdJuan Antonio Osorio Robles1-3/+7
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-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
2017-02-01Remove skip-event-database parameter in ceilometerJeffrey Zhang1-1/+1
skip-event-database parameter is removed by I179eb0d436752e3bb8abaed714664cf74f5615e6 Change-Id: I69b782ae4db373ccefedf39b988c362583077df9
2016-11-15Word choice for back endlijing1-1/+1
This patch changes the use of back end in kolla according to the word choice convention [1]. [1] http://docs.openstack.org/contributor-guide/writing-style/word-choice.html Change-Id: I20f2e158ba487622208d89b48eea0250257f5e76
2016-11-03Remove Fedora supportChristian Berendt1-2/+2
Closes-bug: #1616387 Change-Id: Id97f88b9baa3d48d33ce120962450a374282d044
2016-10-09integrate gnocchi with ceilometerJeffrey Zhang1-1/+10
Closes-Bug: #1626364 Change-Id: I9d586b950b7099a9b160f7b32c9ff00b189a0287
2016-09-25Fix the failure of ceilometer-api containerJeffrey Zhang2-5/+53
* ceilometer-api script is removed and run ceilometer-api by using apache * fix connection url in ceilometer.conf Closes-Bug: #1624905 Change-Id: Iffb00ca418bab6521d61b16de4f5760aa1ae1ac7
2016-09-13Add header blocks to all DockerfilesPaul Bourke1-0/+2
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-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-25Customizations for ceilometerMartin Falatic1-9/+8
This patchset contains customization of Dockerfile of ceilometer containers Change-Id: Iee8db7e105fbd8c3d5c947dd3b7c5e0ca7c49b78 Partially-implements: blueprint third-party-plugin-support
2016-06-16Implement ceilometer ansible roleHui Kang1-1/+1
Change-Id: I13c50a78b2dc7c98b720a4b2e7161104213bd295 Implements: bp ansible-ceilometer
2016-05-26Update ubuntu dockerfiles for formattingSwapnil Kulkarni (coolsvap)1-1/+1
Change-Id: If4be00b937e14ec93443dcb7249cf17099d57cbe Closes-Bug: #1569417
2016-04-17Add missing extend_start files for ceilometer containerHui Kang2-2/+3
Change-Id: I927c0593fc6b669d760b3744a5e77c532a164ca5 closes-Bug: #1571274 Partially-Implements: blueprint ansible-ceilometer
2016-04-12Update Ceilometer dockerfiles for formattingSwapnil Kulkarni (coolsvap)1-1/+2
Change-Id: If5ead9a476a9fede105b328d7ba7422b45eae8a7 Partial-Bug:#1569417
2016-02-10Ceilometer ubuntu binary containerMD NADEEM1-0/+6
Change-Id: I653b6b994de2f4d374d90a831d7a56eaff667404 Partially-Implements: blueprint binary-ubuntu
2016-01-15Remove old config-external.shWanlong Gao1-10/+0
TrivialFix Change-Id: Ib1923d8782699904cbc6a71d2f326d9c207d0005
2015-11-23Drop root for ceilometerSwapnil Kulkarni (coolsvap)2-1/+3
Updates to ensure commands run in the ceilometer containers are done as the 'ceilometer' user rather than root. Change-Id: Ic94b876a002d4413f2038c29ffdb275c68323065 Partially-Implements: blueprint drop-root
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-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-15/+3
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-4/+0
Change-Id: I9bb0a1fac63cc326234b0f06b1e56b43e0753279 Partially-Implements: blueprint replace-config-external
2015-09-04Add 'rhel' for RPM distrosSteven Dake1-1/+2
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/+49
Updated build.py to reflect this change. Deprecate --template option and make it a noop. Change-Id: I7cd98d1ee684a4c64984a49597159868152683b2 Partially-Implements: blueprint remove-docker-dir
2015-05-15Restructure builds to allow more flexibilitySam Yaple3-59/+0
As a restructure, nothing is changed from the original behaviour and naming despite the file structure changing. The symlinks to build had to be updated generating lots of "deleted" and "new_file". The new structure is: docker/${base_distro}/${type}/${container} base_distro == centos, ubuntu, fedora, etc type == source, binary, rdo type rdo is a symlink to binary for backwards compatibility Two new flags are added to the build-all script to support the ability to support different base distros and a flag to support binary or source containers. There are several added folders that are empty to hold the directory structure for future containers of these types. To use a prefix other than centos-rdo- you can set PREFIX in the toplevel directory .buildconf file Change-Id: Ifc7bac0d827470f506c8b5c004a833da9ce13b90
2015-05-06Port to icehouseSteven Dake1-1/+1
This represents making build-docker-images --release build with the icehouse tag and causes docker-compsoe to pull from the icehouse tag. Partially-implements: blueprint port-kilo Change-Id: I66b2c39abc55c0f47152dd90e696fc46b9c58f50
2015-04-27Change the default shell to bashChen Zhiwei1-1/+1
Unify the shell to bash in all Kolla scripts. Change-Id: Ib9591b2f8f344eb88455c5e9b7ecf2164fb5960a Implements: blueprint use-bash-shell
2015-04-06Remove EXPOSE options from DockerfilesSteven Dake1-2/+0
The EXPOSE options will create a local docker-proxy. This is unnecessary with --net=host mode. The docker-proxy adds about 20 microseconds of latency. Add documentation to the specification to indicate where to find the ports that are exposed by the services in case someone were to desire to add EXPOSE back to the Dockerfiles. Change-Id: I398e922fe096d6022a2d5985bb92498f89a5ea31
2015-04-01Allow check_for_* functions to be consumed by wait_forMartin André1-2/+2
In order for the `check_for_*` functions to be consumed by `wait_for`, they should notify of their success but not exit. As a consequence, the previous behavior is restored by the fail_unless_* companion functions. With this change, it is now possible to do: wait_for 30 1 check_for_os_service_running keystone Change-Id: I16ddf8913027030c3ccb5487713d172904508fd6
2015-03-02Allow changing base imageMartin André1-1/+1
By changing the PREFIX variable in the .buildconf one is now able to build docker images from different bases. For example, add the following line to your .buildconf file to build CentOS based images: PREFIX=centos-rdo- Default base image is Fedora. For now only RH family is supported. Additionally, changing the namespace either with the NAMESPACE variable in .buildconf or via --namespace commandline option now changes the source namespace as well from the default kollaglue one. Implements: blueprint multi-baseos Co-Authored-By: Steven Dake <stdake@cisco.com> Change-Id: I3964cd2292789ea883a1f2d2738a5731a4fff49b
2015-01-19Cleanup required variables checks for all containersMartin André1-1/+6
This allows Kubernetes to reschedule containers in case a required variable is missing, for example when the Kubernetes pod is started before the service. The checks were cleaned using the following method: * remove duplicates * remove check for variables that get a default value in the same file * check for all variables used in the file * check for required services when it is obvious. Change-Id: Ib7e0530c410c61f828d36efe8925a20dc9781eab
2014-11-12Add Ceilometer service supportPradeep Kilambi3-0/+56
Implements: blueprint kube-ceilometer-container Change-Id: Ic9be6f2fb57641aa77f7f3a31481b166adad3f36
generated by cgit v1.2.3 (git 2.39.1) at 2026-11-05 22:30:03 +0000