summaryrefslogtreecommitdiff
path: root/docker
AgeCommit message (Collapse)AuthorFilesLines
2019-06-27Merge "Add sha256 in ceph fetch keys" into stable/steinZuul1-0/+2
2019-06-27Merge "Use td-agent-gem to install fluentd monasca plugin on ubuntu" into ↵Zuul2-5/+6
stable/stein
2019-06-27Fix deployment of ceph-nfs container failing due to wrong USERRadosław Piliszek1-3/+0
The startup script requires to be run as root, not ceph. All other ceph images follow this rule. Also removed redundant blank line. Change-Id: I1d69ec0ca97dbbacccfe737fca03c9739244b900 Signed-off-by: Radosław Piliszek <radoslaw.piliszek@gmail.com> (cherry picked from commit dc879dff3bf5cea9d64469395fe140b2ac7e4a3d)
2019-06-26Move back to CentOS StorageSIG repos for Ceph and GaneshaGiulio Fidente2-30/+4
Recently a new repo was created in CentOS to distribute Ganesha, and the repo made a dependency of the Ceph Nautilus repo package [1] When centos-release-ceph-nautilus 1.2-1 will go out, it should not be necessary to disable the CentOS Ceph repos pulled in by dependency of the RDO repositories, as done in [2] 1. https://github.com/CentOS-Storage-SIG/centos-release-ceph/commit/f1a17c9d145cabfa1dfd3102fe7e2fc584f6a907 2. https://review.opendev.org/#/c/651601/ Change-Id: I6bf0cbfaffc22147c5bec03b5897719de53366ed (cherry picked from commit cf47864ab1e4fa6192ea96727d01b3e935b7a1fc)
2019-06-18Add sha256 in ceph fetch keysMichal Nasiadka1-0/+2
fetch_ceph_keys.py is using insecure sha1 function, this patch adds sha256 beside sha1 - in order to remove sha1 safely in U release. Change-Id: I32ba1abd204c9dba4bbe3132b5650b0e391616af Closes-Bug: #1826327 (cherry picked from commit 0a2dc8aa1d267da3c1c2925b3f292bd96aa50edb)
2019-06-18Fix ownership of ironic inspector DHCP hostsdirMark Goddard1-1/+2
If you run with enable_ironic set to true and ironic_inspector_pxe_filter set to dnsmasq (the default in stein), ironic inspector can fail with the following in the logs: Permission denied: u'/var/lib/ironic-inspector/dhcp-hostsdir/<MAC address>' A node must be registered with a port for this to happen. Weirdly this happens on centos/source, ubuntu/source, and ubuntu/binary, but not centos/binary. This change changes the ownership of /var/lib/ironic-inspector/dhcp-hostsdir to ironic-inspector user to make it writeable. Change-Id: I19447727f19dbd9c0a3e17d218b48ddc4c253587 Closes-Bug: #1832026 (cherry picked from commit 41bcd7b4961fd52066b79804fdce9f81cc129735)
2019-06-18Use td-agent-gem to install fluentd monasca plugin on ubuntuMark Goddard2-5/+6
If monasca is enabled on ubuntu, we see the following error in fluentd: [error]: config error file="/etc/td-agent/td-agent.conf" error_class=Fluent::ConfigError error="Unknown output plugin 'monasca'. Run 'gem search -rd fluent-plugin' to find plugins" This is because we use 'fluent-gem install' to install the gem, which works on CentOS but on Ubuntu it is necessary to use 'td-agent-gem install'. Change-Id: I515f9764ca93a41a871e520696193a9298856d08 Closes-Bug: #1830147 (cherry picked from commit c585ca5055c7a92fdbe5826030d3529e5c397540)
2019-06-18Merge "Debian/Ubuntu: more python3 packages for binary" into stable/steinZuul29-86/+94
2019-06-17Merge "[neutron] Do not migrate all subprojects" into stable/steinZuul1-1/+1
2019-06-16[neutron] Do not migrate all subprojectsJason1-1/+1
Instead of migrating all Neutron subprojects at bootstrap time, target specifically the neutron, neutron-fwaas, and neutron-vpnaas subprojects speficially. If a subproject is not specified, all subprojects are migrated, which is not the intended behavior. Change-Id: Icb8d572b7f084804e0423a8a3171dd66646b3885 (cherry picked from commit f36d7aacf28bc75a4b0ece73b45aa09591cd262c)
2019-06-14Fix issues with Percona in Zuul and clean up a little bitRadosław Piliszek7-97/+13
Percona site has connectivity issues from OVH hosts (of Zuul). This patch makes it so that: - the internal repo is actually used - RPM GPG keys are downloaded from the actually used repo - Ubuntu mimics the RHEL behavior (i.e. the Percona repo is enabled only in the xtrabackup image) extra benefit: no need for APT preferences for Percona repo to spare MariaDB deps Change-Id: Id27831f6b404762f9e44fd6bd1c4702bf06b05f8 Signed-off-by: Radosław Piliszek <radoslaw.piliszek@gmail.com> (cherry picked from commit de58339a0e1704ae1ade4e032a73bb4708ecfaf1)
2019-06-09Merge "Bump Monasca Fluentd plugin version" into stable/steinZuul1-1/+1
2019-06-07Debian/Ubuntu: more python3 packages for binaryMark Goddard29-86/+94
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-06-06Switch to RDO Stein release on CentOS & OracleMark Goddard2-7/+13
This change switches from the Delorean yum repositories to the RDO Stein release repository. centos-release-openstack-stein pulls in centos-release-ceph-nautilus, which conflicts with upstream ceph packages. Disable the CentOS Ceph repo to work around this. Change-Id: I1df5dd28adc65ff461a893b60c57d7b5da96d653
2019-06-06Ceph: Update to Nautilus on CentOS and OracleLinuxMark Goddard5-9/+51
The CentOS Stein OpenStack distribution depends on the Ceph Nautilus release, while Kolla currently deploys Luminous on CentOS. This change switches CentOS and OracleLinux builds to use Ceph Nautilus. Support for auth UID has been removed in the Nautilus release [1][2], so we have removed the --set-uid argument from calls to ceph-authtool. Also ceph-osd bootstrap mode fails when no mon config is provided, so we added --no-mon-config (mon config is injected later after bootstrap). Due to ceph-nfs build issues (ceph upstream nfs-ganesha rpms relied on older version of userspace-rcu, than CentOS Storage SIG packages) we need to move to ceph upstream rpm repos. [1] https://github.com/ceph/ceph/commit/d6def8ba1126209f8dcb40e296977dc2b09a376e [2] http://docs.ceph.com/docs/master/releases/nautilus/ Co-Authored-By: Michal Nasiadka <michal.nasiadka@nokia.com> Change-Id: I000398f587c5f4d6cc8995e34e162eebc77bc3e3 Implements: blueprint centos-ceph-nautilus (cherry picked from commit e0cae62c4aab001fa7b5cc324f178793f4e88f3c)
2019-05-31Merge "Fix multiple mon deployment failures" into stable/steinZuul1-1/+11
2019-05-25Install iputils package in neutron containersSlawek Kaplonski1-0/+2
This package provides e.g. arping tool which is used by Neutron services. On e.g. RHEL7 it was probably installed as some dependency to other package but on RHEL8 it's missing which cause some errors e.g. in neutron_l3_agent container. Change-Id: I9c087164f32cb8a69d2155bc68b6f62233ad58c6 Related-Bug: https://bugzilla.redhat.com/show_bug.cgi?id=1713321 (cherry picked from commit 68b998f27efb252a73b0ee4e496d4a3ce32206e2)
2019-05-23Bump Monasca Fluentd plugin versionDoug Szumski1-1/+1
Bump version to include support for setting log message field name. Change-Id: Ib3953b49247bb36ac8ce25578c05c6bcb2a1905a Partial-Bug: #1830184
2019-05-23Fix multiple mon deployment failureswangwei1-1/+11
When 4 or 5 mons are deployed, all mons will always be in the election state, and the ceph cluster cannot be accessed. After comparing with ceph-deploy, I found that when the cluster was initialized, it did not use monmap. When adding a new mon node, it needs to use monmap. According to the above situation, I fixed the problem. Change-Id: Idbfc6741d371adcb06ed97d578d75d3bce862743 Closes-bug: #1824783 (cherry picked from commit 285814353af29395932e15d78c6a154796978a21)
2019-05-20Merge "Add sqlite package to manila-share" into stable/steinZuul1-4/+8
2019-05-16Merge "Drop systemd support from PAM" into stable/steinZuul1-0/+4
2019-05-09Fix bandit failure B105 in keystone fernetMark Goddard1-1/+2
>> Issue: [B105:hardcoded_password_string] Possible hardcoded password: '/etc/keystone/fernet-keys' Severity: Low Confidence: Medium Location: docker/keystone/keystone-fernet/fetch_fernet_tokens.py:27 More Info: https://bandit.readthedocs.io/en/latest/plugins/b105_hardcoded_password_string.html Ignore bandit failures on this line. Change-Id: I9828c23e4bcec7553a69aa5f20e990e0ef0538ea Closes-Bug: #1828416 (cherry picked from commit e6387634c6a7170e96606b9a8ff680f08d81e801)
2019-05-09Add sqlite package to manila-shareRafal Wadolowski1-4/+8
The docker image was built without sqlite package, which is required for nfs backend. Without this package manila-share fails to start. Change-Id: I2f7d8c283393ca947a1d51c6e3cd20e888fbc3e4 Closes-Bug: #1824511 (cherry picked from commit 771584cbb5ecd089d273078ae68fb92ece42e47f)
2019-05-08Drop systemd support from PAMCédric Jeanneret1-0/+4
The line being removed is the cause of audit.log spam with a SELinux enforcing (and permissive) system. They are due to the fact we're calling "sudo" from within some containers, and PAM wants to connect to the host "dbus" socket (mounted in /run). This action is obviously denied by SELinux. The "-" prefix makes this module optional anyway, but apparently PAM does see it and tries to use it. Dropping this module has no consequences other than preventing log spamming. Change-Id: I3e0e86026f5a4a78473bed824cd1682d3a020cd5 Co-Authored-By: Michele Baldessari <mbaldess@redhat.com> Resolves-Bug: #1819461 (cherry picked from commit c4b62490714ea849cedfe07d4b9a6aebf1f815c0)
2019-05-06Reuse /var/lib/tempest symlink for rpm alsoChandan Kumar1-5/+2
https://review.openstack.org/#/c/605980/ with this review in tripleo, we use /var/lib/tempest path but in kolla tempest dockerfile /usr/share/openstack-tempest is used which is not mounted in tripleo deployment. Let's reuse the same volume with tempest container instead of /usr/share/openstack-tempest. Change-Id: I402f58ce53fdce426582cf2fc31349da6d2f5ae0 Signed-off-by: Chandan Kumar <chkumar@redhat.com> (cherry picked from commit 8b8958459809940b812364542a6994a89624f981)
2019-04-29Merge "Install udevadm in ironic-conductor image" into stable/steinZuul1-0/+11
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-04-25Remove oschecks installationMartin Magr1-1/+0
The projects is almost dead and has been deprecated in TripleO project. This patch removes installation of the package on RPM based distros. Change-Id: I3cd9a23af1e925b7e0d739ba2715412ef5911e74 (cherry picked from commit 45c96112008a9fe22b3aa7ce75ce314ab9acc711)
2019-04-24Merge "Fix the problem that the crush map is changed" into stable/steinZuul1-2/+6
2019-04-24Pin kafka java version to 8 on ubuntuErol Guzoglu1-1/+1
Ubuntu default-jre-headless is not working with kafka Change-Id: Ic6ab66128efa931277516e0cf5848a816ca676ad Closes-Bug: #1824847 (cherry picked from commit cb8fa69407bfcbd32a1e40a10c99a8fe53508d1e)
2019-04-19Fix the problem that the crush map is changedwangwei1-2/+6
When deploying ceph osd with kolla, each osd deployment will move the host bucket to default in the crush map. If we adjust the crush map, we have to re-adjust the crush map after adding osd or fixing osd. This commit fixes this problem. Change-Id: Ifdc3a1fd5fe37da529b2aee9811b12f744cff3bf Closes-bug: #1821681 (cherry picked from commit 3d4a7360a7c51a1f1c806a70026a7c8b20e20789)
2019-04-16Merge "Write hash after compressing horizon static assets" into stable/steinZuul1-3/+3
2019-04-16Write hash after compressing horizon static assetsMark Goddard1-3/+3
If you run the horizon container with a restart policy of never, and the static asset compression fails, the container fails to start, e.g. (seen in CI) ++ /usr/bin/manage.py collectstatic --noinput --clear Traceback (most recent call last): File "/usr/bin/manage.py", line 18, in <module> from django.core.management import execute_from_command_line ImportError: No module named django.core.management However, with a restart policy of unless-stopped (the default). the horizon container will fail the first time but will succeed after a restart. This is because the settings bundle hash is updated before the compression is attempted. To fix this, update the hash after compression completes successfully. Change-Id: I3f1682ed55e7d45c1e97a1b34c7993aa839f0bb2 Closes-Bug: #1824137 (cherry picked from commit 92c2456851857c45e8de9a3ff8f167579e0588f4)
2019-04-16Fix the problem of osd initialization failedwangwei1-0/+1
When deploying osd, if the user does not use the extra block partition, the kolla will automatically partition the disk and then clean up the data on the disk partition. Sometimes the disk partition will not be updated, there will be an error not finding the partition. This commit fixes the problem. Change-Id: I14708f38614dcb75268c2f460ae3d921748c2d10 Closes-bug: #1824787 (cherry picked from commit ddab09fdd8d7c08ce8db70948ea12571bb4267a8)
2019-04-15Merge "Fix ubuntu binary deploys" into stable/steinZuul3-12/+17
2019-04-13Add config option use_dumb_init to add it to container imagesRabi Mishra2-3/+8
Usage of dumb-init can also be disabled from cli with `--nouse-dumb-init` when building images. Also moves ENTRYPOINT outside of dumb_init_installation block. Change-Id: Id32d54fc9913b83cf121ede5a5e265e0772062ae Related-Bug: #1821970 (cherry picked from commit fb4cb9efda5a522ba0d837047385b61275d09150)
2019-04-12Fix ubuntu binary deploysMark Goddard3-12/+17
1. Install python3-pymysql in placement-base image. 2. Remove default placement WSGI config. 3. Use python3 for manage.py in horizon Change-Id: Ibb620af2241e39fe99bc48757f90296c0d77d438 Partial-Bug: #1823989 (cherry picked from commit 6c0065185943355851308ae4df23b73918fab7be)
2019-04-10Install "procps(-ng)" in the base imageCédric Jeanneret2-1/+3
Providing tools like "ps", "pgrep" and related is interesting since it helps debugging a container in some cases. It is also useful for healthchecks in case we want to fetch running service PID and use it in another command, like "lsof". Change-Id: I91b1c407caa6b03ae522e649592300f9eddfc07e (cherry picked from commit 9616f49964439966ac8689345b52f4cfc0924258)
2019-04-02Fix Zookeeper buildsMark Goddard1-1/+1
Use the archive URL rather than the current release which has now moved forward. Change-Id: Iab73d3d13025a1498da8c5b573b4cacd8340d3a9
2019-03-28Merge "Fixed file modes in toolbox:/usr/share/ansible"Zuul1-0/+5
2019-03-28Merge "Add cyborg to kolla"Zuul7-0/+163
2019-03-28Fix:kafka package not found by kafka package url白永君1-1/+1
INFO:kolla.common.utils.kafka:Step 9/12 : RUN curl -sSL -o /tmp/kafka.tgz ${kafka_url} && echo "${kafka_pkg_sha512sum} /tmp/kafka.tgz" | sha512sum -c && tar --strip 1 -xvf /tmp/kafka.tgz -C /opt/kafka && rm -f /tmp/kafka.tgz INFO:kolla.common.utils.kafka: ---> Running in 2b751bf5c975 INFO:kolla.common.utils.kafka:curl (http://apache.osuosl.org/kafka/1.0.2/kafka_2.12-1.0.2.tgz): response: 404, time: 0.198, size: 297 INFO:kolla.common.utils.kafka:/tmp/kafka.tgz: FAILED INFO:kolla.common.utils.kafka:[91msha512sum: WARNING: 1 computed checksum did NOT match Closes-bug: #1822030 Change-Id: Ib9a1bc5c0a69f7780e600404601ae875561450cd
2019-03-27Add cyborg to kollaBai Yongjun7-0/+163
Because kolla not have cyborg so should add this. Implements: blueprint add-cyborg Change-Id: I497e67e3a754fccfd2ef5a82f13ccfaf890a6fcd
2019-03-27Add boto3 python dependencies into gnocchi-base imageCyril Grosjean1-5/+8
Adding boto3 python library into gnocchi-base image Change-Id: I22119f570172ca93de0587dc3892d8b8de86d525 Closes-bug: #1821580
2019-03-26Merge "[docker/prometheus] Bump openstack-exporter version."Zuul1-1/+1
2019-03-25Merge "MariaDB upgrade: specify host and port"Zuul1-1/+1
2019-03-25Merge "Install trousers to get user tss for nova_libvirt"Zuul1-1/+3
2019-03-25Merge "cleanup in base for yum install entries"Zuul2-16/+11
2019-03-25Install trousers to get user tss for nova_libvirtMartin Schuppert1-1/+3
The user tss is wanted by libvirt and comes with the trousers package. Prior RHEL8 it comes via the gnutls -> trousers dependencies, but there is no such a dependency in RHEL8, so make sure we have trousers installed. Change-Id: I9f11ba53d5c6f0a435a62bb462164566c4519d9f Closes-Bug: #1821309
2019-03-25Merge "Bump skydive version to 0.22.0"Zuul1-1/+1