69 Commits

Author SHA1 Message Date
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
Vladislav Belogrudov
504fc351ba Cinder-backup misses client part for NFS backend
When using an NFS server for backup a cinder container mounts a location
specified in configuration file (one can do this via add-on files).
The mount process fails due to missing mount.nfs and mount.nfs4 tools.

Change-Id: Ic34667c1bf4d4660a4e773a9f8d98996ea11c070
Closes-Bug: #1620548
2016-09-07 14:57:50 +00: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
Paul Bourke
99cf9465f8 Customizations for Cinder
Implement the new Jinja2 based templating patterns for Cinder, as
outlined in the below blueprint.

Change-Id: I8d0131aff9cc406bd80ce384003308aee672412a
Partially-implements: blueprint third-party-plugin-support
2016-08-11 13:46:05 +00:00
Mathias Ewald
a3b043af10 Add Cinder-Volume Package for Ubuntu binary install
The cinder-volume package is not installed in the cinder-volume
container anymore for the Ubuntu binary install.

It is still there in stable/mitaka but got lost at
I7fb48c954e578772b90a2aa619c8bcfa990b3ae8

Co-Authored-By: Jeffrey Zhang <jeffrey.zhang@99cloud.net>
Change-Id: Icf086b241403c1f9098f70d902484b0c565457d0
Closes-Bug: #1603361
2016-07-18 13:00:39 +00: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)
62bffa7436 Update Cinder dockerfiles for formatting
Change-Id: I73a97fa7b7f4a38aea778d9e7e482f35e22c62a8
Partial-Bug:#1569417
2016-04-13 08:01:19 +05:30
Serguei Bezverkhi
184f01a0d6 Adds iscsid and tgtd docker containers
This partially implements iscsi and lvm2 support for cinder
in Kolla. Adds iscsid and tgtd docker containers.

Change-Id: I7fb48c954e578772b90a2aa619c8bcfa990b3ae8
Partially-Implements: blueprint iscsi-lvm2-docker
2016-04-10 09:17:16 -04:00
Jenkins
989e9da68b Merge "Allow cinder-volume to be configured to use nfs on Centos" 2016-02-24 17:03:03 +00:00
Éric Lemoine
1382e39f16 Remove duplicate code in cinder extend_start.sh
Change-Id: I71953c905b978176bf7dc6bcaf3c4766be4b60fb
Partial-Bug: #1546944
2016-02-24 11:48:07 +01:00
Ryan Hallisey
eab0f1300d Allow cinder-volume to be configured to use nfs on Centos
Closes-Bug: 1548508
Partially implements: blueprint  nfs-support-in-cinder

Change-Id: I3b66252290e61f74ea13889fe136ac74863110f4
2016-02-24 03:19:50 -05:00
Éric Lemoine
170b493d47 Make Heka collect Cinder logs
Partially implements: blueprint heka
Change-Id: I9dcb71a9cf063fb520fcf3485e0376f1e90d87ad
2016-02-19 21:56:10 +00:00
SamYaple
a71c9cbacd Fix missing ceph-common package in cinder
TrivialFix

Change-Id: Iacc6b620cdcf2dac10ef339f7d2decb46c62f339
2016-02-16 14:46:58 +00:00
Martin André
e9a64b589e Cleanup dependencies for cinder-base
The python-cinder package now pulls the required dependency on
python-oslo-policy:

a22f32c619/openstack-cinder.spec (L143)

TrivialFix

Change-Id: I504546e75b5a237fc4aac89bd9a5c34f09570817
2016-02-09 09:23:12 +09: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
Jenkins
4550142177 Merge "Cinder ubuntu binary container" 2016-01-22 17:06:31 +00:00
Artur Zarzycki
29d39b338e Cinder ubuntu binary container
Change-Id: Idfdeee030441a61e5bb1936dea9e5e84c243f156
Partially-Implements: blueprint binary-ubuntu
2016-01-21 15:53:16 +01:00
Qiu Yu
f92151465b Fix cinder create volume from image with kolla source build
After recent drop root changes, all cinder rootwrap calls will fail in source
build because lack of sudoer setting. This change adds sudoer file to enable
rootwrap. It also add missing package dependencies needed for volume from image
in source build type.

Change-Id: I63a2405fb962ac687cdd88c81e1cdc02b3da638d
Closes-Bug: #1536514
2016-01-21 16:32:36 +08:00
Qiu Yu
f714703cad Ensure /var/lib/cinder exists for cinder container
Change-Id: I52e175a1eb5176828db8ed709f4d19dd0685b9c5
Closes-Bug: #1535189
2016-01-18 14:07:28 +08:00
weiyu
b939770afa openstack-cinder for centos-binary
openstack-cinder package is missing a dependency on
python-oslo-policy. Add it to Kolla until RDO packaging is fixed.

Change-Id: I29a1b24e9508f186fa3be5ea6f138b2bd163f8b3
Closes-Bug: 1469891
2016-01-07 15:36:28 +08:00
SamYaple
cda0459ad1 Fix pip install settings
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-12-27 03:35:35 +00:00
Swapnil Kulkarni (coolsvap)
a8661deac6 Drop root for cinder
Updates to ensure commands run in the cinder containers
are done as the 'cinder' user rather than root.

Change-Id: Ibbe04e3a92195dfb957fa56f762c60a80dbe30ca
Partially-Implements: blueprint drop-root
2015-12-01 09:20:46 +05:30
Michal Rostecki
febcb600f1 Source installation in virtualenv
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-27 10:22:17 +01:00
Jenkins
3a81572112 Merge "Fix udev cinder issue" 2015-11-24 17:18:05 +00:00
Swapnil Kulkarni (coolsvap)
59a1c8b9fb Remove hardcoded MAINTAINER in Dockerfiles
Added new option in kolla-build.conf

Change-Id: I45fe51966bcb59ea19d112281ba3d5a1ba091a56
Closes-Bug:#1514304
2015-11-23 11:03:47 +00:00
Sam Yaple
3cd5eec2ec Fix udev cinder issue
/run/udev contains the udev information needed for the lvm tools
/run and /dev must be bound in for this to work properly

Change-Id: Icfe07c4ce3673310cc24591b42c107c9710cd3ac
Closes-Bug: #1518454
Closes-Bug: #1487780
Related-Bug: #1487807
2015-11-20 23:16:16 +00:00
Jenkins
180de5f376 Merge "Use openstack/requirements for cinder" 2015-10-15 14:59:22 +00:00
Paul Bourke
9f39f2725e Use openstack/requirements for cinder
See Iccb4e99f8e4b6659a19c1817d0f4c697824af25c for context.

Change-Id: Ib6a57da3232fb99e92103e606f81774556f76426
Partial-Bug: #150530
2015-10-15 11:09:05 +00:00
Jenkins
0545701d0d Merge "Make Ceph work for RPM based distributions" 2015-10-14 10:58:08 +00:00
Steven Dake
1353538644 Make Ceph work for RPM based distributions
Ceph packages need to be installed in nova, glance, and cinder.
Once that is done, Ceph works like a champ!

Change-Id: I296da1d04d0c1bcb729f22e65e432d53d561b49c
backport: liberty
Closes-Bug: #1505549
2015-10-13 21:48:17 -04:00
Sam Yaple
5f200e0446 Fix issue with su and bad kernels
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-13 15:13:55 +00:00
Sam Yaple
cb4e875ae1 Common start.sh
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-10-06 03:30:26 +00:00
Jenkins
6a622ec82c Merge "Implement a install_type and install_metatype" 2015-09-28 10:49:53 +00:00
Jenkins
aadbbcbee0 Merge "remove set_configs" 2015-09-28 10:34:58 +00:00
Steven Dake
0e99b69de4 Implement a install_type and install_metatype
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-28 03:16:48 -07:00
Sam Yaple
160f1cc011 remove set_configs
Change-Id: I9bb0a1fac63cc326234b0f06b1e56b43e0753279
Partially-Implements: blueprint replace-config-external
2015-09-27 13:44:50 +00:00
Sam Yaple
39aba34b2a Remove all fail sections for Ubuntu
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-27 08:10:59 +00:00
Sam Yaple
99c7eb1997 Make OpenStack use Ceph
This implements all the openstack pieces needed to make ceph work.

DocImpact
Change-Id: I1d24476a966602cf955e5ef872b0efb01319894a
Partially-Implements: blueprint ceph-container
Implements: blueprint kolla-live-migration
2015-09-25 20:11:18 +00:00
Sam Yaple
a1b0518b9a Fix removal of config-external
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-25 20:08:40 +00:00
Sam Yaple
e2e0fd288f Remove config-external.sh
Removes config-external for all services that have been replaced in
Ansible

Change-Id: I839a14418638b977fbc1d02ba6839811b0f909ea
Partially-Implements: blueprint replace-config-external
2015-09-25 13:00:55 +00:00
Ryan Hallisey
57017b0acd Replace config-external with a JSON file for Cinder
Partially-Implements: blueprint replace-config-external

Change-Id: Ic247433290b51c9fb613d90e4a9a0f3d11526b35
2015-09-24 08:12:56 +00:00
Steven Dake
6992049323 Add 'rhel' for RPM distros
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-04 03:12:15 -07:00
Jenkins
91bc4b094c Merge "Allow arbitrary source archive name to be imported into Dockerfile" 2015-09-04 06:24:28 +00:00
Vladislav Belogrudov
c22cf33268 Allow arbitrary source archive name to be imported into Dockerfile
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-03 16:49:50 +03:00
Sam Yaple
9d3f3f28e2 Create openstack-base container
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-09-03 10:37:45 +00:00
Sam Yaple
45f625a73e Remove dest_filename from build.ini
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-31 04:09:59 +00:00
Sam Yaple
cbd42ca6e9 Move docker_templates to docker dir
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-08-28 13:33:50 +00:00
Sam Yaple
13062e23e8 Restructure builds to allow more flexibility
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-15 01:32:22 -05:00