summaryrefslogtreecommitdiff
path: root/docker/base
AgeCommit message (Collapse)AuthorFilesLines
2022-03-09CentOS Stream 8: drop build deps repoMark Goddard1-9/+2
Also rename delorean-train-testing to delorean-train-deps. Change-Id: I1f9688d8b2f5414ef94e5bbf0ec5a771fe252040
2022-03-09CentOS Stream 8: drop CentOS RabbitMQ 3.8 repoMark Goddard2-9/+0
We need 3.7 in Train in order to handle the transition from CentOS 7 to 8. The RabbitMQ image ends up with 3.7.28, but for certainty, this change removes the CentOS RabbitMQ 3.8 repository that was added with the switch to Delorean for CentOS Stream 8. Change-Id: I120be2b28a7214e6b03976719319e4208d8050ab
2022-03-04Build CentOS Stream 8 imagesMichal Nasiadka2-6/+30
This is part of the effort to allow a migration path for operators using CentOS 7 and Train today. Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/831265 Change-Id: I75373eb21c4269c20f72603ad4cf162a472de25b (cherry picked from commit 67d6d28b6208cc004a50f19be1386d88c2404bc4)
2021-06-16Enable Debian updates repoRadosław Piliszek1-0/+3
Backport below Wallaby switching bullseye to buster. Closes-Bug: #1931544 Change-Id: I8460a4159c8da8ae0b856867e068d30fbffb4d34 (cherry picked from commit 789c9c3b84e84796ac8211112fa29f415f560c88)
2021-05-10[CI] Trust only infra mirrors and fix APT mirrorsMarcin Juszkiewicz2-3/+5
Infra mirrors get their indices rebuilt to avoid broken indices (due to partial update). Unfortunately, this wipes out the cryptographic signatures. Our approach so far was disabling apt security features globally. However, this is not a valid choice for external repos. It hid an issue we introduced with new RabbitMQ repos missing proper keys installed in the image. This caused permanent failures outside of our CI. Our process should be as close as possible to users' experience. This patch makes CI trust only the mirrors that have their indices rebuilt (so infra mirrors). For Train, fixed missing override parts as well. And it includes also: - I8209770ca1353fd89aacef0859ca3a373645c6b2 - Icb745f628c1c50d9f20df022b08ddc46fccc270c - Id3b55ac470a977be7ee7decdef3b49e8d89a130f Change-Id: Ic5abc4b87fd76f87aba383abf43e95ba70629fcb Co-Authored-By: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> (cherry picked from commit c364c8be85f4653bf7af1c7ac0378823553e7441) (cherry picked from commit 4a482380408d107c59119b379add34f4b8e87ad7)
2021-05-06rabbitmq: Move to packagecloudMichal Nasiadka3-17/+10
bintray is being shut down 1st of May 2021, rabbitmq docs direct users to packagecloud - so let's move. For Victoria and below, includes I6a3ba599af3deedd450b4ffff6b86a0c04628340 (base: drop Linaro OBS key for CentOS and Ubuntu) For Train, fixes also the order of rpm gpg key imports and yum operations (otherwise CentOS 8 [with dnf] fails because repos are enabled early and keys are missing). And it also pins erlang version where required. Change-Id: I499251d13ca77aea2215f8a879b7bb8dd51f1c9f (cherry picked from commit 641b936bc7fd33203a80bb3827fce7c44d010476)
2021-04-08base: configure curl before first useMarcin Juszkiewicz1-1/+3
We want to have all uses of curl behave the same so we ship config file for it in all images. So do it at start of image so 'base' makes use of config too. Change-Id: I95aa64f0b292cd020574dbedd320ef90529cc7a4 (cherry picked from commit 4328a5b3cc0e90e32952ecfeab2b63407ee8e22a)
2021-02-17Fix several issues (Train)Marcin Juszkiewicz1-3/+0
* sensu: drop Ubuntu support Upstream removed Ubuntu repositories. Train/Stein only * Bifrost: pin IPA builder to 2.4.0 Train & earlier IPA builder master branch now requires diskimage-builder 3.4.0, but Python 2 is supported only up to DIB 2.38. This change works around the issue by pinning IPA builder to 2.4.0, which has a Python 2 compatible dependency on DIB. Change-Id: Ice125e101a689fd3df9d1cd9a093a026f9747a3e
2021-01-26nova-compute: provide needed deps for debian/aarch64Marcin Juszkiewicz2-0/+9
'daxio' needs 'pmdk-tools' which needs 'buster-backports' on aarch64. Train only. - backports repo was enabled in ussuri with move to ceph nautilus - 'pmdk-tools' we pinned with move to QEMU 5 in ussuri Change-Id: Ia5234c7355669a4aa9bb1c45660930aee553e220
2021-01-26Merge "Improve pip install process for offline deployment." into stable/trainZuul1-4/+9
2021-01-24Improve pip install process for offline deployment.Gaël THEROND (Fl1nt)1-4/+9
* "Use distribution-provided pip" * "Use python's pip module invocation method" * "Install pip earlier in order to avoid multiple installation" * "Remove pip_version variable requirement and call" (cherry picked from commit b93c40a3635fbce72e48dc29120e50484cba36ca) - fixed source type builds. - in openstack-base: install virtualenv using upper-constraints (just like in kolla-toolbox) Co-authored-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> Co-authored-by: Radosław Piliszek <radoslaw.piliszek@gmail.com> Depends-on: https://review.opendev.org/c/openstack/kolla-ansible/+/772198 Closes-bug: #1893204 Change-Id: Id0e738044a1931f9d611a7281a48ea4a593f1cf1
2020-12-15Support CentOS 8.3abraden1-2/+2
Backport this until Train. CentOS 8.3 renamed system repos. [1] This caused failures when disabling and enabling. More details in the referenced bug report. Notice CentOS 8.2 and below will no longer work. Train backport also includes some fixes for the fallout from the new pip resolver. * cap bandit<1.6.3, since bandit no longer supports Python 2. * mark kuryr-libnetwork unbuildable for source images. * mark almanach-base & dragonflow-base unbuildable for Debian & Ubuntu source images. * Don't install networking-hyperv in source neutron-server images. pip complains of a conflict. (https://bugs.launchpad.net/kolla/+bug/1907826) [1] https://wiki.centos.org/Manuals/ReleaseNotes/CentOS8.2011#Yum_repo_file_and_repoid_changes Change-Id: I2d67b3ed7b7c521bc755ec9a87365c9962a9eeff Closes-Bug: #1907213 Closes-Bug: #1907826 Co-Authored-By: Radosław Piliszek <radoslaw.piliszek@gmail.com> Depends-On: https://review.opendev.org/766211 Depends-On: https://review.opendev.org/767157
2020-09-14Fix kolla_set_configs --check with a directoryMark Goddard1-5/+6
There are several issues with kolla_set_configs --check: 1. We calculate the destination path incorrectly when comparing a file in a directory, due to passing arguments to os.path.relpath in the wrong order 2. For directories that have not changed, we also attempt to compare them as files, which fails when they are open()ed. 3. If the config JSON does not have a config_files key, it fails with a KeyError. The first two issues affect the fluentd container, which specifies directories as the source, without using a glob. The third affects OVN containers. This patch fixes these issues. Closes-Bug: #1890567 Change-Id: I8921befe51da4282121443849177a7ca5ebe8822 (cherry picked from commit c5320eb22386c34d83435fa0b9aa03b178996b52)
2020-09-04Use upstream Erlang on CentOS 8Radosław Piliszek2-7/+16
Train only. In CentOS 8 Train we had a mix of rmq upstream and rdo packages, erlang was from RDO and rmq (3.7) from rmq. As this is not really tested by any other party, I propose to unify the sources of both. Change-Id: I52094ce9e3d98cbdedfdc23c8a43dd3093ce1771 Closes-bug: #1884034
2020-07-06Drop systemd support from nsswitch.conf on RHEL-based distros9.2.0Michele Baldessari1-1/+2
A bit like we did for I3e0e86026f5a4a78473bed824cd1682d3a020cd5 we should remove the nss-systemd lookup from containers. The reasons for this are as follows: 1) Just like for I3e0e86026f5a4a78473bed824cd1682d3a020cd5 when this nss module is triggered it tries to talk to dbus. It triggers a bunch of selinux denials and it makes little sense to open all containers to talk to dbus. In particular, if a container is run as non-privileged and bind-mounts /run from the host, we will hit selinux denials like the following: type=USER_AVC msg=audit(1592337775.860:74119): pid=1284 uid=81 auid=4294967295 ses=4294967295 subj=system_u:system_r:system_dbusd_t:s0-s0:c0.c1023 msg='avc: denied { send_msg } for msgtype=method_call interface=org.freedesktop.DBus member=Hello dest=org.freedesktop.DBus spid=406228 scontext=system_u:system_r:container_t:s0:c162,c886 tcontext=system_u:system_r:system_dbusd_t:s0-s0:c0.c1023 tclass=dbus permissive=0 exe="/usr/bin/dbus-daemon" sauid=81 hostname=? addr=? terminal=?'UID="dbus" AUID="unset" SAUID="dbus" 2) It just makes little sense in a kolla-world to have containers talk to dbus/systemd and it saves us some time when a lookup triggers the systemd module for whatever reason. Especially because the nss-systemd module does a few things which are not useful in a container (ensures that the root and nobody users and groups remain resolvable, SystemD's DynamicUser= feature, provide Lookup API via Varlink) The sed regex gives us the wanted results: $ diff -u /etc/nsswitch.conf.orig /etc/nsswitch.conf --- /etc/nsswitch.conf.orig 2020-06-19 07:18:10.974580755 +0000 +++ /etc/nsswitch.conf 2020-06-19 07:20:12.260230103 +0000 @@ -53,9 +53,9 @@ # group: db files # In order of likelihood of use to accelerate lookup. -passwd: sss files systemd +passwd: sss files shadow: files sss -group: sss files systemd +group: sss files hosts: files dns myhostname services: files sss netgroup: sss Related-Bug: #1883849 Change-Id: I81e5b7abf4571fece13a029e25911e9e4dece673 (cherry picked from commit dc2ddfa9750f94430a5b04b62fc1fa6adcb234f8)
2020-06-26Change lang package block orderGaël THEROND1-15/+17
Fix offline installation of language pack packages. Change-Id: I9f4a21bbf1c8383e21e59350206aba3424602270 Closes-bug: #1883233 (cherry picked from commit f9def021d86caecfd57018f41792f8a7c6bc6a80) (cherry picked from commit 714e1feaea947b6a014d34e5a9cecfc777472ca1)
2020-05-17switch to official CentOS 8 repositoriesMarcin Juszkiewicz2-34/+26
RDO builds of stable/train for CentOS 8 went into phase when we do not need to use delorean builds. EPEL is disabled like it is in Ussuri (RDO packages may conflict with it). Erlang for RabbitMQ is used from CentOS 8 'rabbitmq-38' repo while RabbitMQ is still 3.7.* from same place as usual. 'python3-pika' is dropped from openstack-base as it is EPEL only package and is not used by any image (dropped in Ussuri in https://review.opendev.org/#/c/710003/ patch) AArch64 is not supported until CentOS 8.2 release. Change-Id: I9d3ed54f4d10ef7ad2d52ed3aeca15f3968cd163
2020-04-08add dpdk_telemetry and logparser for C8, use centos-release-opstools for C8Piotr Rabiega1-2/+2
Adds collectd-dpdk_telemetry and collectd-logparser packages to collectd RHEL8-based image. dpdk_telemetry plugin collects DPDK ethernet device metrics via dpdk_telemetry library. Logparser is plugin for filtering and parsing log messages. Change-Id: I0c7c94e9fae9d11660f938b8d7d6be0f270c972f (cherry picked from commit 36f6e56d6674c02818e44d5cb3c40660ba2b0644)
2020-03-20CentOS 8: Enable hacluster and masakari imagesMarcin Juszkiewicz1-0/+1
CentOS 8.1 came with HA repo. So we can use it. hacluster-pcs image is disabled as we lack 'crmsh' package for it. Partially-Implements: blueprint centos-rhel-8 Co-Authored-By: Mark Goddard <mark@stackhpc.com> Change-Id: I1c786eda399eca4464c9d68ac040c2965350f775 (cherry picked from commit 92224ccb518c90d7c269158d074d811aee2f05f0)
2020-03-17kibana, nova-libvirt: handle it properly for non-x86Marcin Juszkiewicz3-0/+33
manual backport from master changes: - https://review.opendev.org/#/c/712987/ - https://review.opendev.org/#/c/713403 Upstream kibana package contains NodeJS x86-64 binaries so can not be used directly on non-x86 architectures. I took upstream packages, removed NodeJS binary from it and added 'nodejs' dependency. Package is present in my Linaro OBS repository where I keep other packages needed for aarch64 kolla run. Via APT pinning I mark them as not wanted so they are not used on any architecture with two exceptions: 1. libvirt - we need fixed version to be able to use ThunderX servers 2. kibana - to be able to run it at all For x86-64 upstream kibana package is used. Closes-bug: #1867365 Change-Id: I955619d6992f8714ae753dc155e248d255340ecf
2020-03-06Merge "Use StorageSIG repos for Ceph in CentOS8" into stable/trainZuul2-3/+14
2020-03-05Use StorageSIG repos for Ceph in CentOS8Alfredo Moralejo2-3/+14
Storage SIG has built Ceph Nautilus and Ganesha for CentOS8 in CentOS Build System. Let's switch to use them in kolla. Depends-On: https://review.opendev.org/711214 Change-Id: Id37dca84c4eb918aaf2d3c036ef5387fe75988dd (cherry picked from commit 0c6312968214e403b5a408d69df17bd0a9267095)
2020-02-28CentOS 8: Install python in the base image (Train only)Mark Goddard1-0/+9
This was missed due to the difference in base package lists between master and stable/train, with train having separate lists for binary and source, and master having a single combined list. Partially-Implements: blueprint centos-rhel-8 Change-Id: I4417ad735933df786651f3190cc3250b9b306027
2020-02-26CentOS 8: Use upstream Ceph/masterMichal Nasiadka2-0/+37
The only Ceph version that will support CentOS 8 is Octopus. It will be released end of March 2020 - so for now let's use master. Change-Id: I5955acb41e7346802d76f4f2b244cbf5c36f5bf2 Partially-Implements: blueprint centos-rhel-8 (cherry picked from commit 70423f19596f92ed01c89e7d62f8c46a6dba6a23)
2020-02-26CentOS 8: base and openstack-base imagesMark Goddard4-35/+126
Adds support to the base and openstack-base images for CentOS 8. These images have been removed from the list of unbuildable images, and replaced with all dependent images. This change also includes backports of a number of other changes related to the base image: * CentOS 8: disable repo_gpgcheck for grafana image (Ice120e8001fd9e8bb37ca4f2df26259cf798ee0e) * CentOS 8: base image fixes for RabbitMQ, fluentd & InfluxDB (Ibbb720390ff17e11249a5aa77163c15c0971209a) Change-Id: I18fba8a5c2f99b700990cbf41c76077a1ec2408a Partially-Implements: blueprint centos-rhel-8 (cherry picked from commit 3c618a1f6f0beca723e031fbe323b159400ad08f)
2020-02-24Remove tgtd and scsi-target-utils support in CentOS/RHEL 8Maciej Kucia1-2/+10
In CentOS/RHEL 8 there is no scsi-target-utils package, nor is it available in EPEL. In RHEL 7 and beyond the LIO kernel subsystem can be used instead of the tgtd daemon. This change removes support for the SCSI target daemon on CentOS/RHEL 8. The 'tgtd' image is no longer available for CentOS/RHEL 8. Change-Id: I56f230d66f75dd0546325676278f91579f08c822 Signed-off-by: Maciej Kucia <maciej@kucia.net> Co-Authored-By: Maciej Kucia <maciej@kucia.net> Co-Authored-By: Mark Goddard <mark@stackhpc.com> Related: blueprint centos-rhel-8 Depends-On: https://review.opendev.org/#/c/702417 (cherry picked from commit 946749312f31c36d9dac8ff3a545894e9043190d)
2020-01-14CentOS 8: work around mod_ssl certificate issueMark Goddard1-0/+9
CentOS 8 has an issue with mod_ssl which produces an invalid Apache configuration in /etc/httpd/conf.d/ssl.conf. This causes the following error on startup: SSLCertificateFile: file '/etc/pki/tls/certs/localhost.crt' does not exist or is empty Work around this by generating certificates manually. Partially-Implements: blueprint centos-rhel-8 Change-Id: Id8bcefa3527575ba72fe37013787ba716e435ac8 (cherry picked from commit 3590188383d8590a1e91573da656776563f65fcb)
2020-01-14Refactor Apache httpd setupMark Goddard2-2/+20
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-12-08Ensure lsb-release exists on debian/ubuntuDincer Celik1-1/+3
Change-Id: I74142928d97af932a04e33476771360579e01ee7 Closes-Bug: #1853474 (cherry picked from commit 05c84fdf86d62545043cd36b984ca7627308d63d)
2019-11-21base: generate en_US.UTF-8 locale data for Debian/Ubuntu systemsMarcin Juszkiewicz1-0/+3
Change-Id: Id2463692f5a633b6e50af6e7ce6e3f49612e4c5d Closes-bug: #1852452 (cherry picked from commit 19ba215f8c0de9a1a0aa8cc40d96fc841ee80df1)
2019-10-30Merge "Change ODL repo to nexus.opendaylight.org"Zuul1-3/+2
2019-10-29Merge "base: use en_US.UTF-8 locale on all distros"Zuul1-1/+1
2019-10-29Merge "Remove /var/yum/cache from CentOS base image"Zuul1-5/+2
2019-10-29base: use en_US.UTF-8 locale on all distrosMarcin Juszkiewicz1-1/+1
C.UTF-8 is not supported in RHEL 7: https://bugzilla.redhat.com/show_bug.cgi?id=1361965 Closes-bug: #1850035 Change-Id: I20dcb86e7e119b9f5ca44cd066fcb9cb84af1ce4
2019-10-28Change ODL repo to nexus.opendaylight.orgMichal Nasiadka1-3/+2
Change-Id: I242945edba84b891ccbf82d5fcce8ef5fe37ad3d
2019-10-28Remove /var/yum/cache from CentOS base imageMark Goddard1-5/+2
Since https://review.opendev.org/#/c/682600/, the following lines result in /var/yum/cache being present in one of the layers of the base image: RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("centos_yum_repo_packages"), chain=True, clean=False) }} \ {% for repo in base_centos_yum_repos_to_disable | customizable('centos_yum_repos_to_disable') -%} && yum-config-manager --disable {{ repo }} \ {% endfor -%} {% for key in base_centos_yum_repo_keys | customizable('centos_yum_repo_keys') -%} && rpm --import {{ key }} \ {% endfor -%} && /bin/true {% block base_centos_repo_overrides_post_yum %}{% endblock %} RUN {{ macros.rpm_security_update(clean_package_cache) }} This is because it is not cleaned in the first RUN statement. This adds 76MB to the image. Also, using two separate RUNs which results in an extra 23MB due to updates to /var/lib/rpm/Packages. Found via https://github.com/wagoodman/dive. Change-Id: I0302ee1dfc10a2b7df127ac6a7764a84b1d74a33 Closes-Bug: #1850036
2019-10-26Merge "Move to RDO Train packages"Zuul1-0/+2
2019-10-24Merge "get 'apt_*' options of kolla-build.conf working again"Zuul3-0/+4
2019-10-23base: drop not used apt preferences for UbuntuMarcin Juszkiewicz1-4/+0
We used APT preferences to limit Ubuntu to Ceph 'mimic' (13.x) but those packages are no longer present so we got Ceph 'nautilus' (14.x) in our images. So let's drop not used settings. Change-Id: I51da99efedc0b11c8ff529475f7878e6d9f5e63f
2019-10-21Move to RDO Train packagesMichal Nasiadka1-0/+2
Change-Id: I396f929ecc11f87fb83585bedd39be93a605c57b
2019-10-17get 'apt_*' options of kolla-build.conf working againMarcin Juszkiewicz3-0/+4
We broke 'apt_sources_list' and 'apt_preferences' options quite a while ago. Turned out that fix is quite simple. This change adds empty sources.list and apt-preferences files which are always added into images. If kolla-build.conf will use any of APT related options then those files will be replaced with provided ones. Change-Id: I7bbdcbd5c60f654a484a872209e0537e3950346c Closes-bug: #1706549
2019-10-12Custom CA certificates installation mechanismViktor Michalek4-1/+37
Change-Id: I0fd596d93a0e575a391250d4bed261ad370a3664
2019-10-03Merge "Use C.UTF-8 locale"Zuul1-0/+6
2019-10-02Merge "Fluentd: There is available td-agent pkg for Buster"Zuul1-1/+1
2019-10-02Fluentd: There is available td-agent pkg for BusterViktor Michalek1-1/+1
Thanks a lot to Masahiro Nakagawa https://github.com/treasure-data/omnibus-td-agent/issues/209#issuecomment-530340475 Change-Id: I9c4993436844d45bc9df2815659fa7c420910b01
2019-10-01debian: switch to Train binary packagesMarcin Juszkiewicz2-4/+4
Repository may not contain all packages yet. Change-Id: I88e1c8c1ce78fc138fa2541b15a7620fa7300043
2019-09-27Merge "ppc64le: Ensure that rabbitmq-server.repo exists before trying sed"Zuul1-1/+5
2019-09-26Use C.UTF-8 localeRadosław Piliszek1-0/+6
This ought to fix problems with Unicode, including the recent vmtp issue with tabulate 0.8.4 failing due to non-Unicode locale (Ubuntu Bionic 18.04 Python 3.6). Change-Id: I8b55a6a260cab14c2292cac02a1a07729223c281 Related-bug: #1845306 Signed-off-by: Radosław Piliszek <radoslaw.piliszek@gmail.com>
2019-09-24ppc64le: Ensure that rabbitmq-server.repo exists before trying sedMike Turek1-1/+5
TripleO container builds are currently failing for ppc64le as the rabbitmq repo file doesn't exist, causing sed to fail. [0] The file not existing is expected for TripleO image builds as these repos are overriden in this case. [1] This patch tests that the file exists to prevent this failure. [0] https://centos.logs.rdoproject.org/tripleo-upstream-containers-build-master-ppc64le/1540/logs/logs/build.log [1] http://eavesdrop.openstack.org/irclogs/%23openstack-kolla/%23openstack-kolla.2019-09-23.log.html#t2019-09-23T16:42:29 Change-Id: I7bf6d064ad8deb94a8fe53f4f4735f7b13ff27b1 Co-Authored-By: Mark Goddard <mark@stackhpc.com>
2019-09-24Fluentd: td-agent repository for DebianViktor Michalek2-0/+4
Change-Id: I0f05183889971dcc014663a849d3fc1d87a19e8e
generated by cgit v1.2.3 (git 2.39.1) at 2026-11-05 19:54:14 +0000