summaryrefslogtreecommitdiff
path: root/docker/heat
AgeCommit message (Collapse)AuthorFilesLines
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-01-14Refactor Apache httpd setupMark Goddard2-14/+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 (cherry picked from commit 8484190e77e4237247dac7fba128e5a111fc9918)
2019-06-07Merge "Debian/Ubuntu: more python3 packages for binary"Zuul1-1/+1
2019-06-06Debian/Ubuntu: more python3 packages for binaryMark Goddard1-1/+1
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-06Debian/Ubuntu: move to Python 3 for source imagesMarcin Juszkiewicz1-1/+1
Commit 43b74ccc157c0b50138c3785ed91dab504895571 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-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-03-12Add python3 packages for RHEL systemsAlex Schultz2-5/+24
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-01-17Use base_package_typeAlex Schultz5-12/+12
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
2018-10-10heat-all: mark as not available for DebianMarcin Juszkiewicz1-1/+1
Change-Id: I972f94b26d34783f055cf4a559fafb2c14ea76a5
2018-02-05Remove heat-api-cloudwatch imagerabi1-20/+0
In 6d55417f80384ead56e176beec9e2fc4eb162d61 cloudwatch api has been removed from heat. Change-Id: I70cb2aec7f262ab3a4afc383b502c6fed68ce01c Related-Bug: #1747294
2017-05-12Fix if $user is root at extend_startegonzalez901-1/+1
In ubuntu is not evaluating correctly if $user == root check at extend_start. Changing to "$(whoami)" == 'root' fixes the issue Change-Id: I296a1f98764cdfa09650c483bc7beba53e6bdba4 Closes-Bug: #1690360
2017-05-03Override image's meta info.Jawon Choo6-6/+6
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-20Merge "Add missing cleanup step for heat images"Jenkins1-0/+13
2017-04-20Add missing cleanup step for heat imagesMartin André1-0/+13
The heat images got apache as part of blueprint apache-packages-for-apis without a cleaning up. Without this step the containers may fail to restart due to runtime files already present. Change-Id: I55a7144caa913117f71100f757b1e601de6471a6 Closes-Bug: #1679565
2017-04-20Use LABEL instead of MAINTAINER (deprecated) in all Dockerfile.j2Chen6-6/+6
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 Juszkiewicz4-5/+5
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 Gonzalez2-8/+8
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-5/+8
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-27Prevent apache from listening on port 80 for heat-baseMartin André1-3/+9
A recent change added httpd to heat-base image without preventing it to listen to port 80 like it is done for other images. Co-Authored-By: Juan Antonio Osorio Robles <jaosorior@redhat.com> Change-Id: I52573c804bfdf729ef994012abb9d7e4c277585d Closes-Bug: #1675308
2017-03-14Add Apache packages to heat containersMartin André1-2/+28
Some projects that use Kolla docker containers (TripleO) run heat under httpd. This patch adds the httpd package so that it exists in the container and can optionally by used via Docker entrypoints. As many of these projects do not require the use of Apache (it is opt-in) at this point not all deployment frameworks support the use of it so the existing configuration defaults have been left as-is for now. Change-Id: I4d648c4ce4f5f6ba311bfbbf9c78e06104163c61 Partially-Implements: blueprint apache-packages-for-apis
2017-03-09Add heat-api-cloudwatch imageMartin André1-0/+20
The heat-api-cloudwatch service is used in TripleO. Partially-Implements: blueprint containerize-tripleo Change-Id: I98d251ea34cf7ee451b45f0b8c6873488a229c36
2017-02-20Merge "Use install-pip macro in most source images"Jenkins1-1/+6
2017-02-17Use install-pip macro in most source imagesChao Guo1-1/+6
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-15Add heat-all containerDan Prince1-0/+24
TripleO makes use of a heat-all container for undercloud installation. This container includes the API, Engine, and a new heat-all launcher (included in the monolith package). Implements: blueprint heat-all Change-Id: If1cc3e959b63f775e15e6eeef4b54981fb3793e9
2017-02-05Remove include_header and include_footer in all DockerfilesJeffrey Zhang3-4/+0
include_header and include_footer parameter is already removed, remove them in all Dockerfiles. Add missing footer block. Change-Id: I90da03eb9f95a3827361d5f5ede65fde7d6be2b3
2017-01-17use static uid/gid in imagesSam Yaple1-5/+5
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-05Remove footer block and variable in *-base imagesJeffrey Zhang1-1/+0
Change-Id: I39aa88489f744f779150695f3f55ef80d42e1c61 Closes-Bug: #1653247
2016-11-03Remove Fedora supportChristian Berendt4-4/+4
Closes-bug: #1616387 Change-Id: Id97f88b9baa3d48d33ce120962450a374282d044
2016-09-19Create the heat_stack_user/owner role in the heat roleChristian Berendt1-2/+0
Change-Id: I78ce0071474fc693aa2a05397b2a9b5974266cd9 Partial-bug: #1609814
2016-09-13Add header blocks to all DockerfilesPaul Bourke4-0/+9
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-29Change source with dot at extend_start filesEduardo Gonzalez1-1/+1
Is a best practice in Unix/Linux scripts to use dots instead of source command. Using dots will avoid issues with non BASH shells TrivialFix Change-Id: Ie6480a1954f853f79faffa093452715ebd9f7d90 Signed-off-by: Eduardo Gonzalez <dabarren@gmail.com>
2016-08-19Merge "Update heat base Dockerfile to include footers"Jenkins1-0/+3
2016-08-19Handle empty package list for install_packagesShaun Smekel4-4/+4
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-08-18Update heat base Dockerfile to include footersSwapnil Kulkarni (coolsvap)1-0/+3
This is not in sync with the current changes being merged for customization Change-Id: Ic6bbf32e2e48efef7cc0c5a3112a7fd8d09a5db6 Partially-implements: blueprint third-party-plugin-support
2016-08-11Add --user-domain when adding heat role adminDave Walker (Daviey)1-1/+1
The --user-domain parameter is required when adding the role for Heat. Without it, the command fails and the bootstrap container exits early with the error message: "No user with a name or ID of 'heat_domain_admin' exists." Change-Id: I6f813edde3f437bca3ef521a43454146082bc5f5 Closes-bug: #1611768 Signed-off-by: Dave Walker (Daviey) <email@daviey.com>
2016-07-26Implement customizations for heat-api-cfn containerEduardo Gonzalez1-10/+7
Add customizations for heat-api-cfn containers Partially-implements: blueprint third-party-plugin-support Change-Id: Ibee860cd902cbd4167e4ae20b498c4652c2ad430 Signed-off-by: Eduardo Gonzalez <dabarren@gmail.com>
2016-07-19Customizations for heatMichal (inc0) Jastrzebski3-36/+27
This patchset contains customization of Dockerfile of heat containers Change-Id: I3c2bae909ec6e8c3b0e460115ded3cc2456a212f Partially-implements: blueprint third-party-plugin-support
2016-05-26Update ubuntu dockerfiles for formattingSwapnil Kulkarni (coolsvap)4-4/+4
Change-Id: If4be00b937e14ec93443dcb7249cf17099d57cbe Closes-Bug: #1569417
2016-04-13Merge "Update Heat dockerfiles for formatting"Jenkins2-2/+4
2016-04-12Make Heat bootstrapping idempotentSteven Dake1-1/+1
Change-Id: I155707ec6c1973d2a36606a0c73e57bda58ed037 Closes-Bug: #1569696
2016-04-12Update Heat dockerfiles for formattingSwapnil Kulkarni (coolsvap)2-2/+4
Change-Id: Ic6cc78f2d105dd6ae9de200fee40e9fa2031088f Partial-Bug:#1569417
2016-03-24Change heat domain to heat_user_domainSamYaple1-3/+3
heat_user_domain is what is in the docs, but more importantly it is what we have in Liberty and will be a requirement to doing upgrades properly. Change-Id: I9cf53d43b4faaa5d1b0156cc50192722d2739602 Closes-Bug: #1553565
2016-03-09Upgrade HeatSteven Dake1-5/+9
This could possibly use gold plating in how bootstrapping operates to use shade rather than the shell in the container. It is unclear why stack create failed prior to this patch, but that fact hasn't changed. I think the heat domains are not setup properly in the configuration files, meaning that the domain ID must be created outside of Heat and registered in the configuration file. This is covered in Bug #1553565. Change-Id: I490d4dd68a101f388c0ecb4acab54d5eaa6e314e Partially-Implements: blueprint kolla-upgrade Implements: blueprint upgrade-heat
2016-02-24Remove duplicate code in heat extend_start.shÉric Lemoine4-10/+6
Change-Id: I8970d02ccbed1dfc221683e273edc2680207056b Partial-Bug: #1546944
2016-02-19Make Heka collect Heat logsÉric Lemoine3-3/+21
Partially implements: blueprint heka Change-Id: Ie22c4326c6ec2a3426b0c3b8fda4554b1b2541b0
2016-01-28Use trusts in heat.confMichal Rostecki1-3/+5
Change-Id: Ie91b3498e9f9d0d74a502ba6945db531ef967516 Closes-Bug: #1492736
2015-12-30Merge "Heat ubuntu binary container"Jenkins4-0/+24
2015-12-30Heat ubuntu binary containerArtur Zarzycki4-0/+24
Change-Id: Iae54825c48da6b22bc83331918f5734f9821ea03 Partially-Implements: blueprint binary-ubuntu
2015-12-27Fix pip install settingsSamYaple1-1/+1
There were some inconsistencies with pip install instructions thoughout Kolla. We fix those here. Additionally, we fix the virtualenv to properly use the site-packages on the host if a library is not available in the venv. Change-Id: Ib84d48e8826bb96060338b3fa0782620c98794a8 Related-Bug: #1524684 Closes-Bug: #1529434
2015-11-27Source installation in virtualenvMichal Rostecki1-1/+1
Use virtualenv for installation of OpenStack projects and dependencies to avoid conflicts with Python libraries installed by non-OpenStack binary packages. Change-Id: I21ecd673b2e93335b1d3dd4e279e940c9d694c3c Implements: blueprint virtualenv
generated by cgit v1.2.3 (git 2.39.1) at 2026-11-05 17:57:32 +0000