summaryrefslogtreecommitdiff
path: root/docker/ironic
AgeCommit message (Collapse)AuthorFilesLines
2020-03-16Merge "Adds python3-systemd for ansible deploy interface" into stable/steinZuul1-0/+3
2020-03-11Adds python3-systemd for ansible deploy interfaceAntony Messerli1-0/+3
When doing a source install, ironic doesn't have python3-systemd as a dependency and the current ironic-conductor container doesn't install the required dependencies which causes the ansible deploy interface to fail with the error, "Systemd bindings do not exist". This adds the needed dependencies when doing a source build. This installs the needed files for both rpm and deb builds on python 2.x and 3.x. Change-Id: I5d1bcb0f7d7902b4e122c12697483433bcf52ca2 Closes-Bug: #1861427 (cherry picked from commit 4a67e58f7971641c55247f02985e13ef391ca7ab)
2020-03-11Add ssh clients to Ironic Conductor containerAntony Messerli1-0/+4
Adds ssh clients to Ironic Conductor container for ansible deploy interface. Change-Id: Ib995c6ebe5ee76ee1a39e4b5918a79bd61b87a01 Closes-Bug: #1862079 (cherry picked from commit 7234e8b2f72275c85caa146a6d9e49d1ab8281b7)
2019-12-31create missing apache2 directory on Debian/UbuntuMarcin Juszkiewicz2-0/+2
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 (cherry picked from commit 932f09bcd65e15524b5229fdb6bc73a7e0111b27)
2019-06-07Debian/Ubuntu: more python3 packages for binaryMark Goddard3-5/+5
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> (cherry picked from commit aa59f0db6f88ed0a03169b473fdf6d541d34df9f)
2019-04-25Install udevadm in ironic-conductor imageMark Goddard1-0/+11
backport: rocky, queens A dependency on udevadm was recently added to ironic-lib: https://review.opendev.org/#/q/I9db48a3462422749290bbb887c14816734ab0478 Change-Id: I6c5746606ab59fd88e35525ecc17a62bfa9211e6 Closes-Bug: #1825784 (cherry picked from commit 856b2c8824967e582c3d2e98851b58efab6757f8)
2019-03-13Use virtual package for ansibleAlex Schultz1-2/+2
Rather than specify ansible-python3 or ansible, we can try the virtual package for the python specific version of ansible. Change-Id: I246edfaf8cc0ee12852c18c6f9027e48880797a4
2019-03-12Add python3 packages for RHEL systemsAlex Schultz3-9/+37
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-02-28debian/ubuntu: make use of Python3 based packagesMarcin Juszkiewicz1-2/+2
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-01-17Use base_package_typeAlex Schultz4-14/+14
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-11-07Do not load iscsi_tcp from within a container.Cédric Jeanneret3-9/+0
The module must be loaded from the host directly in order to avoid any SELinux issues. There are examples in kolla-ansible and tripleo-heat-templates: - https://review.openstack.org/#/c/605624/ - https://review.openstack.org/#/c/605450/ Change-Id: Ica68a109c3ed577e6a339ef315b576061cd557e5 Related-Bug: 1794550
2018-10-05Add ironic-staging-drivers to ironic-conductor for RHEL family binary and ↵Dan Williams1-2/+4
source based builds. Change-Id: I1a7533c738edeff4e696e95b9b267c23a78003e9 Closes-Bug: #1796194
2018-08-06Using qemu-kvm on rhelAttila Fazekas1-1/+9
qemu-kvm-ev was used with centos, in case of rhel when you have access to the virtualisation related channels qemu-kvm pulls qemu-kvm-rhev which is the recommended one. qemu-kvm-ev was referenced by devstack long time ago, but the explicit package install on rhel family today is qemu-kvm and not qemu-kvm-ev. I am unsure about the other distros, so just changing rhel. Change-Id: If6d1e0367730fa80284395be33674a7cd1465389
2018-07-19Merge "Apply Ironic rolling upgrade logic"Zuul1-0/+11
2018-07-10Stop using deprecated rpm package namesMartin André1-2/+2
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-10Apply Ironic rolling upgrade logicDuong Ha-Quang1-0/+11
This patchset apply Ironic rolling upgrade logic [1][2]: - Add ironic-dbsync online_data_migration to ironic-api image. [1] https://docs.openstack.org/ironic/latest/contributor/rolling-upgrades.html [2] https://docs.openstack.org/ironic/latest/admin/upgrade-guide.html#rolling-upgrades Co-Authored-By: Ha Manh Dong <donghm@vn.fujitsu.com> Change-Id: I14edf639e5120ea9c81252295161b76bc4514cbe Implements: blueprint apply-service-upgrade-procedure
2018-05-15copy iPXE NBP to /tftpboot during PXE bootstrapWill Szumski1-3/+17
This allows you to chainload iPXE from a standard PXE environment. As the PXE container already has apache installed, we now have everything we need to support iPXE booting. Change-Id: Ide32dc1910e9f8b3ff875238648726f719e271b2 Implements: blueprint ironic-ipxe
2018-02-21Merge "syslinux package is only built for x86_64"Zuul1-1/+6
2018-02-15syslinux package is only built for x86_64Mark Hamzy1-1/+6
The syslinux package is only built for x86_64 and not for ppc64le or aarch64. Change-Id: I773e6ddf20ba2030fdeeb1ee66e79f20f82168aa Closes-Bug: 1749780
2018-02-14Add socat to base imageMartin Mágr1-4/+0
We would need socat tool to perform healthchecks on the various containers. Closes-Bug: #1749227 Change-Id: Ibda77a8d041d894f5efac6578e52b11651bca97f
2018-01-17Merge "Validate Dockerfile indentation in pep8"Zuul1-2/+2
2017-12-12ironic-conductor: update driver dependencies for QueensDmitry Tantsur1-8/+8
* Added python-sushy for CentOS/RHEL for the redfish driver (introduced in the Pike release). * Added ansible and systemd-python for ansible driver (introduced in the Queens cycle). * Added python-scciclient as it was packaged for CentOS/RHEL. * Removed seamicroclient, pyghmi and pyremotevbox as the corresponding drivers were removed. * Removed wsman as no drivers use it any more: the AMT driver was removed, the iDrac driver switched to python-dracclient. Most of removals happened as part of the Ocata driver cleanup: https://docs.openstack.org/releasenotes/ironic/ocata.html#id9 Change-Id: I8774a45bb1cfcdf5c3b675e235fb074af4a9646c
2017-12-05Validate Dockerfile indentation in pep8Martin André1-2/+2
Delegate code style validation to computers, they're better than human at it :) This commit adds a new `tools/validate-indentation.sh` script that errors when it finds an indented Dockerfile instruction, and enables the validation in the pep8 check. Also adjust the logic of `tools/validate-all-dockerfiles.sh` so that it doesn't stop on first errors but instead shows all of them. Fixes the remaining indentations in Dockerfiles. Change-Id: I53c0d38304cb4f6d64a5dfab67f70d69b3eae587
2017-10-26ironic-pxe: generate aarch64 bootfile grubaa64.efiZhangfei Gao2-0/+26
Install grub-mkimage & grub2-mkimage accordingly to generate grubaa64.efi, which used as bootfile on aarch64. Change-Id: I21f66951e5d97603bb03da596ac353c2cf3f840e Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org>
2017-08-18Fix wrong sudoers file syntax in ironic-conductorguochao1-1/+1
This error make the container keep restarting. Change-Id: I4cdd77eededb6e32282f7a2b33be7ea1181d68b6 Closes-Bug: #1711495
2017-06-29Add e2fsprogs and xfsprogs to ironic-conductorMark Goddard1-4/+12
These are required for formatting ext and XFS ephemeral disk partitions when using the iSCSI deployment drivers. Change-Id: Icd187cdd1eb0cb36fbda6c04304bd25d31199bd7 Closes-Bug: #1701320
2017-06-15Add Apache packages to ironic-api containerDmitry Tantsur2-2/+47
This is required to be able to run ironic-api under wsgi, instead of standalone. Change-Id: I5944b969c4b64ae73c285bc9f8260cdef9cfceaa Related-Blueprint: apache-packages-for-apis
2017-05-03Override image's meta info.Jawon Choo4-4/+4
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 "Use LABEL instead of MAINTAINER (deprecated) in all Dockerfile.j2"Jenkins4-4/+4
2017-04-20Add missing cleanup step for new apache imagesMartin André1-0/+10
A few new 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. This commit fixes it for all images with the exception of heat-base so that it can be cleanly backported to stable/ocata. It also removes the unused APACHE_DIR variable from freezer-api and keystone extend_start.sh script. Change-Id: I47d75221b3d1aae91f11d3e0da83e221a00315b7 Closes-Bug: #1679565
2017-04-20Use LABEL instead of MAINTAINER (deprecated) in all Dockerfile.j2Chen4-4/+4
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-17Use ironic-inspector user for ironic-inspectorMark Goddard4-65/+0
This change updates the ironic-inspector image to use the ironic-inspector user rather than the ironic user to execute the ironic inspector service as this more closely aligns with what is typically done by downstream packagers (specifically, Ubuntu and RDO). This change rebases the ironic-inspector image onto the openstack-base image instead of the ironic-base image. We configure an ironic-inspector user and use this to execute the ironic-inspector service. We also configure ironic-inspector to log to /var/log/kolla/ironic-inspector instead of the previous ironic location. Following this change we no longer need the workaround of a sudoers file for the binary install type that was added in change I8ecd0b658b8df8f38ddf717fa9443d4dc2896984. Change-Id: Ibdc5ba35db61f4974d4282aff34bcb5ccd952d45 Closes-Bug: #1624457
2017-04-10Merge "ironic-pxe: handle non-x86 architectures"Jenkins1-1/+7
2017-04-06ironic-pxe: handle non-x86 architecturesMarcin Juszkiewicz1-1/+7
'syslinux' is built only for x86 architectures Partially-Implements: blueprint multiarch-and-arm64-containers Change-Id: I6fa78fd4e301649acd085b84d71047a207277927
2017-04-04debian: enable all images enabled for UbuntuMarcin Juszkiewicz5-7/+7
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-04Merge "Use separate sudoers for ironic conductor modprobe"Jenkins4-4/+7
2017-03-31Use separate sudoers for ironic conductor modprobeMark Goddard4-4/+7
The original fix (8b101b28a1040fd6b4753c09364106274d7e6e09) for bug 1676466 added unnecessary entries to the sudoers file in the ironic-base image. These included a rootwrap entry pointing to the virtualenv used by source type images (not present in binary type images) and a modprobe iscsi_tcp which is only required by the ironic-conductor image. This change adds a single sudoers file for the iscsi_tcp modprobe to the ironic-conductor image and reverts to the common pattern of adding a sudoers file to ironic-base only for source type images. Change-Id: I89f1c4bd741de9ba184f14fcbcb708636616e420 Closes-bug: #1678143 Related-bug: #1676466 Related-bug: #1667864
2017-03-28Alphabetize packagesEduardo Gonzalez3-33/+33
Some images have packages sorted alphabetically and some not. Unify common style between all images. Change-Id: I906ed89c10b12886665618752f525ba71d83d991
2017-03-28Merge "RHEL: Add mod_ssl for services running over httpd"Jenkins1-2/+4
2017-03-27Add ironic sudoers file to binary packages as wellDan Prince1-2/+2
When built as binary packages Ironic conductor would fail to start due to a new 'sudo modprobe iscsi_tcp' command added in 05c0d6998bdda155c925d563b75ac353303f93ff Change-Id: I74ebbc2ec612e1068ac82225dc79e9ee0b6c23f4 Closes-bug: #1676466
2017-03-27RHEL: Add mod_ssl for services running over httpdJuan Antonio Osorio Robles1-2/+4
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-27Merge "Prevent apache from listening on port 80"Jenkins1-2/+4
2017-03-23Prevent apache from listening on port 80Martin André1-2/+4
A few new images got apache as part of blueprint apache-packages-for-apis without restricting it to listen on port 80. This commit fixes it for all images with the exception of heat-base so that it can be cleanly backported to stable/ocata. Co-Authored-By: Juan Antonio Osorio Robles <jaosorior@redhat.com> Change-Id: Idd3bbeffea9233eaed420798e22ea9a3a517c166 Closes-Bug: #1675308
2017-03-23ironic-conductor: add missing comma for centos/source buildMarcin Juszkiewicz1-1/+1
Due to missing comma images built for centos/source lacked dosfstools and util-linux packages. Closes-Bug: #1675414 Change-Id: I2fa284890f038c5dcf18669ed19c123f6850d4a2
2017-03-14Load iscsi_tcp module when starting ironic-conductorJeffrey Zhang3-1/+7
ironic-conductor depends on iscsi_tcp module Change-Id: I1dd7d1a8cd67bbdfc1262b39aa96997c12681900 Closes-Bug: #1672245
2017-02-22Fix binary ironic-inspector rootwrap configurationMark Goddard3-1/+5
When built with the binary install type (at least on CentOS), Ironic inspector fails to start and the container remains in a restarting state. The log file shows that it is failing to execute iptables, and analysis found that this was due to an incorrect rootwrap configuration. The RDO ironic inspector RPM expects Ironic inspector to be run as the ironic-inspector user, however Kolla uses the ironic user. This means that neither of the packaged ironic nor ironic-inspector sudoers configuration files works for us. Kolla currently installs a sudoers file pointing to the rootwrap script in the virtualenv of the source install, but of course this only makes sense for source installs, and should not be installed for binary installs. This change adds a second sudoers file that will work for the binary install type, and installs the correct sudoers file for the install type. Change-Id: I8ecd0b658b8df8f38ddf717fa9443d4dc2896984 Closes-Bug: #1624457
2017-02-21Merge "Install shellinabox and socat packages in ironic"Jenkins1-4/+12
2017-02-20Install shellinabox and socat packages in ironicJeffrey Zhang1-4/+12
These packages are needed by ironic console. Change-Id: Ieff5142935fb55cc9860d6cd4f195da095a01449 Closes-Bug: #1666131
2017-02-17Use install-pip macro in most source imagesChao Guo3-3/+18
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-05Remove include_header and include_footer in all DockerfilesJeffrey Zhang4-4/+0
include_header and include_footer parameter is already removed, remove them in all Dockerfiles. Add missing footer block. Change-Id: I90da03eb9f95a3827361d5f5ede65fde7d6be2b3