52 Commits

Author SHA1 Message Date
Radosław Piliszek
da33e18ac8 Install glusterfs-client in Debuntu
Closes-Bug: #1964140
Change-Id: I4658a06b077d096ab9f2cb5070e39c98b5a27254
2022-03-08 16:23:26 +01:00
Marcin Juszkiewicz
38fcd184e8 centos: enable repos where needed
With RDO use we did not disabled some repositories. This patch disable
them and enable where needed.

Change-Id: Ia9d537fe9c1ad54789d2bfb4027254fbb3defe7e
2021-04-13 11:21:39 +00:00
LinPeiWen
9ca43b9ed7 Add glusterfs-fuse package to manila-share container
Change-Id: I2b4cfdb25f3ff82d8d6fdebba8b75a818c10a388
2020-08-24 09:18:36 +00:00
James Kirsch
5bdf514645 Refactor httpd install to base image
Refactor installing and initial setup of httpd and mod wsgi from
individual services to base image.

Change-Id: I651a55a9ebe258ef403d33de010a4dfb368a4021
2020-08-10 09:51:07 +00:00
Marcin Juszkiewicz
53443c5c71 Remove support for CentOS 7
With the move to RHEL/CentOS 8 we no longer have Python 2 in our images
so there is no need for checking which Python version (2.x or 3.x) is
used inside of containers.

We also no longer have to support yum as a value for
distro_package_manager.

Partially-Implements: blueprint centos-rhel-8

Change-Id: Ie45cf3465fedddbde7856961527421883ba3d5c9
2020-04-15 09:32:06 +00:00
Alfredo Moralejo
0c63129682 Use StorageSIG repos for Ceph in CentOS8
Storage SIG has built Ceph Nautilus and Ganesha for CentOS8 in CentOS
Build System.

Let's switch to use them in kolla.

Change-Id: Id37dca84c4eb918aaf2d3c036ef5387fe75988dd
2020-03-03 16:31:53 +05:30
Christian Berendt
861f55fbfd Add block labels to all Dockerfiles
Change-Id: I9692dda817ef134d647247431565e1b58cf9da41
2020-03-01 17:25:58 +00:00
Michal Nasiadka
70423f1959 CentOS 8: Use upstream Ceph/master
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
2020-01-30 10:35:50 +00:00
Mark Goddard
8484190e77 Refactor Apache httpd setup
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
2019-12-11 11:38:46 +00:00
Marcin Juszkiewicz
cf11cd6f3d Enable repos only when needed
Disable external repositories by default and enable only when needed.

Depends-on: https://review.opendev.org/696480

Implements: blueprint repos-off-by-default

Change-Id: Icf2a8397a8349e0fe849d88d160409fd234480a9
2019-11-29 11:38:06 +01:00
Dincer Celik
1d5a208c2e [manila] Fixes manila-share on debian/ubuntu
manila-share cannot start on debian/ubuntu because python3-cephfs is missing.

Change-Id: Ia592dda4ee20979c701efe6007f236dba9848997
Closes-Bug: #1851692
2019-11-08 13:36:15 +03:00
Zuul
17ce7d4de6 Merge "Debian/Ubuntu: more python3 packages for binary" 2019-06-07 08:29:09 +00:00
Mark Goddard
aa59f0db6f Debian/Ubuntu: more python3 packages for binary
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-06 11:06:58 +00:00
Marcin Juszkiewicz
d436001b43 Debian/Ubuntu: move to Python 3 for source images
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-06 11:59:03 +01:00
Marcin Juszkiewicz
932f09bcd6 create missing apache2 directory on Debian/Ubuntu
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-06-03 15:11:24 +02:00
Rafal Wadolowski
771584cbb5 Add sqlite package to manila-share
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
2019-05-07 14:12:05 +00:00
Alex Schultz
3e5d8e2653 Add python3 packages for RHEL systems
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-03-12 17:48:18 +00:00
Alex Schultz
ae1322ec10 Use base_package_type
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
2019-01-17 08:23:41 -07:00
Goutham Pacha Ravi
170be6d17a Add support to deploy manila-api with Apache/wsgi
- Add required packages to run the manila-api service
  with Apache/mod_wsgi, the mod_ssl package has been
  added for RHEL/centos/oraclelinux only.
- Add necessary cleanup to the start script of the container.
- Add directories and configuration files that can be
  optionally used via Docker entrypoints.

Change-Id: Id88760655b3419e7b6bec012ebfda16fb92e5ea3
Implements: bp apache-packages-for-manila-api
2018-09-05 19:11:42 +00:00
caowei
a71a61a471 Add ceph-common package to manila-share container
Change-Id: I6248152d9a272a1cfa3ebc549428b67ead111f45
Implements: blueprint manila-cephfs-backend
2017-10-30 10:25:15 +08:00
Giulio Fidente
8f5fc7c4ea Add ceph-common to manila_share image
Manila supports Ceph as backend in which case the manila_share
image should bundle ceph-common

Change-Id: Ie0af337b195636bd6e6be93706a7e293c3ab6055
2017-06-30 15:35:36 +02:00
Eduardo Gonzalez
85cdb0b894 Enable manila-data for rpm binary
manila-data package is included as part of
openstack-manila installed in manila-base image.

This change removes exit while building for rpm
binary images.
http://cbs.centos.org/koji/rpminfo?rpmID=86923

Change-Id: I0c8e65a99cd96a3fef159519efd51bdcee1af30f
Closes-Bug: #1671667
2017-05-16 12:20:09 +02:00
Jawon Choo
31259fa595 Override image's meta info.
centos based images have wrong label info,
these changes fix own image's name and build-date.

Change-Id: I1d13f8f386c8db12b5fbe5f8ecbbf9e3fbb4ba1c
Closes-Bug: #1680341
2017-05-03 11:08:17 +09:00
Chen
8c463a47a9 Use LABEL instead of MAINTAINER (deprecated) in all Dockerfile.j2
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-20 16:50:05 +09:00
Marcin Juszkiewicz
69fef5cd59 debian: enable all images enabled for Ubuntu
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-04 22:48:18 +02:00
Chao Guo
961224c6cf Use install-pip macro in most source images
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-17 08:49:32 -03:00
Jeffrey Zhang
e5903d5fa9 Remove include_header and include_footer in all Dockerfiles
include_header and include_footer parameter is already removed, remove
them in all Dockerfiles.
Add missing footer block.

Change-Id: I90da03eb9f95a3827361d5f5ede65fde7d6be2b3
2017-02-05 10:44:48 +08:00
zhubingbing
eb2a648b70 Fix manila-base dockerfile format
source and binary alll need sudoers

Change-Id: I190a0b8cbbb05460e1ff80e0e7a30d05c3392640
2017-01-20 06:58:05 +00:00
Sam Yaple
58eee09c15 use static uid/gid in images
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-17 09:02:21 -03:00
Jeffrey Zhang
6ef486fbff Remove footer block and variable in *-base images
Change-Id: I39aa88489f744f779150695f3f55ef80d42e1c61
Closes-Bug: #1653247
2017-01-05 22:05:29 +08:00
Mauricio Lima
379475585b Add nfs package in manila-data dockerfile
Change-Id: I737bfc8cddaf4fa9c848fc6fc5380f78a425cc40
Closes-Bug: #1643877
2016-11-22 09:52:30 -03:00
caowei
8cfd040e12 Remove Fedora support from manilla-data
Manilla was missed in the previous patch that deprecated Fedora
from the project.

Related-Bug: #1616387
Change-Id: Ib041817eaa3818cd0e86466b030b212782c074da
2016-11-09 07:50:52 +08:00
Jenkins
d69ab19701 Merge "Remove Fedora support" 2016-11-04 13:39:07 +00:00
Mauricio Lima
a6ccbe1803 Fix Manila-data binary distro
Closes-Bug: #1639011

Change-Id: Icc4e798590645910de1a86eaf46082343d999f6a
2016-11-04 04:51:16 +00:00
Christian Berendt
5cd30d4914 Remove Fedora support
Closes-bug: #1616387
Change-Id: Id97f88b9baa3d48d33ce120962450a374282d044
2016-11-03 10:50:22 +01:00
Mauricio Lima
d62552463f Add manila-data service
Change-Id: Ie82f1dd7773ef2cc2c6724ec0b5f78ebd79566ee
Closes-Bug: #1635370
2016-10-27 11:47:04 -03:00
Paul Bourke
b41247c656 Add header blocks to all Dockerfiles
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-09-13 16:53:31 +01:00
Eduardo Gonzalez
8e98e5f15e Change source with dot at extend_start files
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-29 07:29:16 +02:00
Shaun Smekel
a9d08726f5 Handle empty package list for install_packages
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-19 10:49:03 +00:00
Mauricio Lima
fdf9dd508d Customizations for Manila
Change-Id: I3383f206b66d1af39273ec0564a53f1f7a592527
Partially-implements: blueprint third-party-plugin-support
2016-08-12 11:47:15 -04:00
Jeffrey Zhang
3f79e37d21 Fix the overwrite sudoers file issue
Change-Id: I4b109f7fdc3b8e49defed26979b04ca158842e98
Closes-Bug: #1598423
2016-07-05 05:49:13 +00:00
Swapnil Kulkarni (coolsvap)
435b21b90d Update ubuntu dockerfiles for formatting
Change-Id: If4be00b937e14ec93443dcb7249cf17099d57cbe
Closes-Bug: #1569417
2016-05-26 04:09:22 +00:00
Swapnil Kulkarni (coolsvap)
84aceccf27 Update Manila dockerfile for formatting
Change-Id: I83a7292ce84cd951de0127e6d3593e4e3beb43af
Partial-Bug:#1569417
2016-04-12 16:14:10 +00:00
MD NADEEM
d4a5c75db6 Manila ubuntu binary container
manila-share is present in manila-common package.

Change-Id: Ida231c0468b6ee3bb6a76fb9f475724abf95c1cb
Closes-Bug:#1553199
2016-03-17 17:19:01 +05:30
Mauricio Lima
a9edc7e0a0 Install openvswitch-switch in manila
Change-Id: I8277ad668f46d327807a01ceb96c2abb417f0e3d
Closes-Bug:#1556271
2016-03-14 12:18:31 -04:00
Mauricio Lima
285e42a99c Make Heka collect Manila logs
Partially implements: blueprint heka

Change-Id: I3fadbf29f5219a293b8b1114d192e27888be2c59
2016-03-03 10:53:59 -05:00
Mauricio Lima
f85386085d Add manila_sudoers file
All manila rootwrap calls are failing in
source build because lack of sudoer setting

Change-Id: I301fd7b6ff3721328828c2e0384f7e320146731b
Partially-Implements: blueprint enable-manila-containers
2016-02-24 13:30:29 -05:00
Mauricio Lima
1312140635 Add manila perms to /var/cache/manila
Change-Id: I1ad667487ce1e0fbae340bed2233aacd4f895bce
Parially-Implements: blueprint enable-manila-containers
2016-02-15 11:12:47 -05:00
SamYaple
2514bcf0c3 Correct issue with virtualenv rootwrap
Because we use rootwrap in a venv we need to update the exec_dirs.
Without doing this *some* commands will break for various reasons that
I won't get into in this review in detail. But this is required for
neutron-l3-agent in a container + drop-root.

Change-Id: I1a09f7188fdd501b7ce251d9f2fb0e5b10222142
Partially-Implements: blueprint drop-root
2016-02-06 06:48:59 +00:00
SamYaple
5a251ca75f Fix manila perms
Change-Id: I5b40de377ac0323d3253f58b49318d57da347d11
Parially-Implements: blueprint enable-manila-containers
2016-02-02 18:04:56 +00:00