aboutsummaryrefslogtreecommitdiff
path: root/docker/heat
AgeCommit message (Collapse)AuthorFilesLines
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
2015-11-23Remove hardcoded MAINTAINER in DockerfilesSwapnil Kulkarni (coolsvap)4-4/+4
Added new option in kolla-build.conf Change-Id: I45fe51966bcb59ea19d112281ba3d5a1ba091a56 Closes-Bug:#1514304
2015-11-12Move USER operation after footerSam Yaple3-6/+6
The USER operation affects all docker commands after it. This causes a problem with our {{ include_footer }} implementation since commands in that footer may require elevated permissions to perform. In the current implementation I can no longer remove my proxy settings once the USER has been changed. Change-Id: I9b2bab5a15f595f6d52a46c64ddf59ba5608b938 Partially-Implements: blueprint drop-root
2015-11-11Drop root for heatSteven Dake5-1/+9
Drop root user for heat containers. Change-Id: Ib07c0193f97bb18cc6154b4015b4056fd983f6c1 Partially-Implements: blueprint drop-root
2015-11-11install openstack-heat-common in heat-baseSteven Dake1-1/+9
the openstack-heat-common package installs the Heat UID/GID. This is necessary pre-work for drop-root for heat services. Change-Id: I247b0209248de144d20f5245973833be5cd8f14f Partially-Implements: blueprint drop-root
2015-10-15Use openstack/requirements for heatPaul Bourke1-1/+1
See Iccb4e99f8e4b6659a19c1817d0f4c697824af25c for context. Change-Id: I36de9a5c52ac265d0fb54ba7d540048aedf33fde Partial-Bug: #150530
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-06Common start.shSam Yaple6-38/+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 "Heat doesn't need to specify python-oslo-reports"Jenkins1-8/+1
2015-09-28Merge "Implement a install_type and install_metatype"Jenkins4-4/+4
2015-09-28Merge "remove set_configs"Jenkins3-12/+0
2015-09-28Heat doesn't need to specify python-oslo-reportsSteven Dake1-8/+1
This package is correctly specified in the dependencies of the heat packaging now so removing it from the base package. Change-Id: I9028f41f5ee95b728c425235846b9825501b6f70 Implements: blueprint rhel-based-image-support
2015-09-28Implement a install_type and install_metatypeSteven Dake4-4/+4
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 Yaple3-12/+0
Change-Id: I9bb0a1fac63cc326234b0f06b1e56b43e0753279 Partially-Implements: blueprint replace-config-external
2015-09-27Remove all fail sections for UbuntuSam Yaple4-27/+6
Ubuntu binary is not supported and may never be. Installing from cloud-archive packaging is only for the current stable distros, Ubuntu does not have a Delorean type repo. We place a fail message in the base image to catch this and remove the messages throughout the project. An additional fail message is placed to catch all other things. Change-Id: Id2953f503ebd42226f6a08e75979ae56511c40f7 Implements: blueprint install-from-ubuntu
2015-09-25Fix removal of config-externalSam Yaple3-3/+0
I removed the files but not the COPY commands thus breaking all of Kolla Change-Id: I37d3e0cb94a1ecc12971f485f953310ba8fee53c Partially-Implements: blueprint replace-config-external
2015-09-25Remove config-external.shSam Yaple3-30/+0
Removes config-external for all services that have been replaced in Ansible Change-Id: I839a14418638b977fbc1d02ba6839811b0f909ea Partially-Implements: blueprint replace-config-external
2015-09-24Replace config-external with a JSON file for HeatRyan Hallisey3-18/+12
Change-Id: Ie79667ec2f9b091403ead9abc3c0f85afb7944bc Partially-Implements: blueprint replace-config-external
2015-09-04Add 'rhel' for RPM distrosSteven Dake4-4/+4
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-09-04Merge "Allow arbitrary source archive name to be imported into Dockerfile"Jenkins1-2/+2
2015-09-03Allow arbitrary source archive name to be imported into DockerfileVladislav Belogrudov1-2/+2
Currently we cannot import source archives with names different than expected by hardcoded line in Dockerfiles. This worked well for Openstack services' tarballs where we expected SERVICE-* root folder after extraction or kanaka-noVNC for nova-novncproxy docker. The latter fails if one tries to clone or get tarball under other names. This fix allows any archive (tar,tgz,zip) or repo name to be imported into dockerfile. Change-Id: I869a6a19afaf0e93925572746c22b7589b6600c9 Closes-Bug: #1491415
2015-09-03Create openstack-base containerSam Yaple1-1/+1
This creates and moves the dependencies for Ubuntu into a common openstack-base container. This commit shows dramatically smaller sizes for all non-openstack containers. The Openstack container remain the same size. Change-Id: I2f46420d4b9edcfddda374caddcce906fc708f6c Partially-Implements: blueprint openstack-common-container
2015-08-31Merge "Add Ansible support for Heat"Jenkins4-8/+14
2015-08-31Remove dest_filename from build.iniSam Yaple1-1/+1
We can, and should, figure out the filename dynamically rather than hardcode that value in build.ini since it is not actually a configurable paramater. Change-Id: I496d6555e9fa356ab09e62063fd707f43ed08121 Closes-Bug: #1490386
2015-08-29Add Ansible support for HeatSteven Dake4-8/+14
This changes bootstrapping of the Heat container to bootstrap the Heat container with a heat domain user. This requires some work from bootstrap.yml to pass in several environment variables needed by the heat domain setup script. Co-Authored-By: Sam Yaple <sam@yaple.net> Change-Id: Iab05983754fa514835cb5ff54d775faa18773110 Partially-implements: blueprint ansible-heat
2015-08-28Move docker_templates to docker dirSam Yaple10-0/+181
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 Yaple14-217/+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 Dake4-4/+4
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
generated by cgit v1.2.3 (git 2.39.1) at 2026-11-06 00:29:54 +0000